Conflict handling for non-text files
Brian W. Fitzpatrick
fitz at red-bean.com
Thu Aug 2 00:49:33 CDT 2007
Committed this patch in r2824.
-Fitz
Index: ch03-advanced-topics.xml
===================================================================
--- ch03-advanced-topics.xml (revision 2823)
+++ ch03-advanced-topics.xml (working copy)
@@ -944,13 +944,14 @@
Subversion does not attempt to perform contextual merges
during updates. Instead, any time you have locally modified a
binary working copy file that is also being updated, your file
- is renamed with a <filename>.orig</filename> extension, and
- then Subversion stores a new working copy file that contains
- the changes received during the update, but not your own local
- modifications, at the original filename. This behavior is
- really for the protection of the user against failed attempts
- at performing contextual merges on files that simply cannot be
- contextually merged.</para>
+ is left untouched and Subversion creates two new files. One
+ file has a <filename>.oldrev</filename> extension and contains
+ the BASE revision of the file. The other file has a
+ <filename>.newrev</filename> extension and contains the
+ contents of the updated revision of the file. This behavior
+ is really for the protection of the user against failed
+ attempts at performing contextual merges on files that simply
+ cannot be contextually merged.</para>
<para>Also, if the <literal>svn:mime-type</literal> property is
set, then the Subversion Apache module will use its value to
More information about the svnbook-dev
mailing list