[PATCH] svn resolved

Richard Cavell richardcavell at mail.com
Wed Oct 5 02:20:43 CDT 2011


The book advises the user to use the svn resolved command, yet that command is deprecated.

 While we're at it, is there any explanation as to why a property conflict is given a .prej extension? What does .prej stand for? And does that explanation need to go in the book?

 Richard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20111005/17f46f6e/attachment.html>
-------------- next part --------------
Index: ch03-advanced-topics.xml
===================================================================
--- ch03-advanced-topics.xml	(revision 4104)
+++ ch03-advanced-topics.xml	(working copy)
@@ -1252,8 +1252,8 @@
  
         <para>To resolve property conflicts, simply ensure that the
           conflicting properties contain the values that they should,
-          and then use the <command>svn resolved</command> command to
-          alert Subversion that you have manually resolved the
+          and then use the <command>svn resolve --accept=working</command>
+          command to alert Subversion that you have manually resolved the
           problem.</para>
 
       </sidebar>


More information about the svnbook-dev mailing list