svn commit: r992566 - /subversion/trunk/notes/wc-ng/conflict-storage

[rh...@apache.org]

Author: rhuijben
Date: Sat Sep  4 09:20:03 2010
New Revision: 992566

URL: http://svn.apache.org/viewvc?rev=992566&view=rev
Log:
* notes/wc-ng/conflict-storage
  (intro): Note that we have to store the names of the conflict markers
    somewhere to keep compatibility with preserved-conflict-file-exts and
    obstructing filenames.

Modified:
    subversion/trunk/notes/wc-ng/conflict-storage

Modified: subversion/trunk/notes/wc-ng/conflict-storage
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/wc-ng/conflict-storage?rev=992566&r1=992565&r2=992566&view=diff
==============================================================================
--- subversion/trunk/notes/wc-ng/conflict-storage (original)
+++ subversion/trunk/notes/wc-ng/conflict-storage Sat Sep  4 09:20:03 2010
@@ -48,6 +48,16 @@ equivalent in wc-ng conflict storage (su
 but this information can be deduced from the information stored
 (e.g. conflict-old and friends; foo.r42 is now 'foo' + '.r' + left_rev)
 
+### BH: We have to store the exact name of the conflict marker files. If we
+### just 'guess' how conflict markers are named by using their revision
+### numbers, we can't handle situations where there are existing files with
+### these names. The WC-1.0 code uses a unique name function to generate a
+### unique marker file name which happens to match this pattern if there are
+### no conflicts, but sometimes explicitly preserves the existing file
+### extension to help diff tools. (See 'preserved-conflict-file-exts' in our
+### config). I think we can move the names of the markers into the skel and/or
+### keep them in their own columns. (These names are needed on filling a
+### svn_wc_entry_t)
 
 Operation skel
 --------------