[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 3497] New - auto merge as much as can; then print summary,
From:       Paul Hammant <paul () hammant ! org>
Date:       2009-09-22 18:23:35
Message-ID: iz3497 () subversion ! tigris ! org
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=3497
                 Issue #|3497
                 Summary|auto merge as much as can; then print summary, then go
                        | into merge arbitration
               Component|subversion
                 Version|1.6.x
                Platform|PC
                     URL|
              OS/Version|Linux
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|ENHANCEMENT
                Priority|P2
            Subcomponent|cmdline client
             Assigned to|issues@subversion
             Reported by|paul_hammant






------- Additional comments from paul_hammant@tigris.org Tue Sep 22 11:23:34 -0700 2009 -------
Svn's merge processing should help people understand more about how long its going to take.
It would be great if it did all the auto-merges first, then printed a statistics table:

  3567 files automatically merged
  52 files requiring merge intervention
  ===
  1/52 foo/bar.txt - merge intervention required (kdiff3 being launched)
  [M] merge, [AT] accept theirs, [AY] accept theirs ...

This way teams facing daunting merge challenges can keep their manages informed as to their progress

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2398599

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]