[SvnBook] #95: Output of the interacitve conflict resolution

SvnBook noreply at red-bean.com
Sun Mar 23 14:25:47 CDT 2008

#95: Output of the interacitve conflict resolution
 Reporter:  khmarbaise  |       Owner:  nobody
     Type:  defect      |      Status:  new   
 Priority:  normal      |   Milestone:  1.5   
Component:  content     |     Version:        
 Keywords:              |  
 In the section "Resolve Conflicts (Merging Others' Changes).
 The output of the update command is not as it is in the SVN 1.5-beta 1
 The output looks like the following:

 Conflict discovered in 'bar.c'.
 Select: (p) postpone, (df) diff-full, (e) edit,
         (h) help for more options: h

 And the following list of the possible selections is like the following:
   (p)  postpone    - mark the conflict to be resolved later
   (df) diff-full   - show all changes made to merged file
   (e)  edit        - change merged file in an editor
   (r)  resolved    - accept merged version of file
   (mf) mine-full   - accept my version of entire file (ignore their
   (tf) theirs-full - accept their version of entire file (lose my changes)
   (l)  launch      - launch external tool to resolve conflict
   (h)  help        - show this list

 This entry is in relationship to http://www.red-bean.com/pipermail

 As an attachment to the following [http://www.red-bean.com/pipermail
 /svnbook-dev/2008-March/003790.html mail] you can find a [http://www.red-
 dev/attachments/20080321/2d469476/attachment.bin patch] for the book:

Ticket URL: <http://svnbook.red-bean.com/trac/ticket/95>
SvnBook <http://svnbook.red-bean.com/>

More information about the svnbook-dev mailing list