subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache subversion Wiki <comm...@subversion.apache.org>
Subject [Subversion Wiki] Update of "FileMerge" by JulianFoad
Date Fri, 18 Jan 2013 00:10:57 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.

The "FileMerge" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/FileMerge?action=diff&rev1=8&rev2=9

  
  === Text Translation ===
  The following table show what translations are performed between "repository normal form"
(RNF) and "working copy form" (WCF):
- ||<tablewidth="90%">svn:special ||yes ||no ||no ||no ||no ||
+ ||<tablewidth="90%">svn:special ||yes [2] ||no ||no ||no ||no ||
  ||svn:mime-type ||n/a ||bin ||txt ||txt ||txt ||
  ||svn:eol-style ||n/a ||n/a ||no ||'native' ||'CR', 'CRLF', 'LF' ###? ||
  ||What's translated? ||symlink ||kw ||kw ||kw, eol ||kw (and eol is repaired if another
type is encountered) ||
@@ -56, +56 @@

  
  Also the 'left' text is translated to the (kw? eol?) form of the 'right' text ### ...
  
-     ### Bert says: Merge uses a different kind of repository normal form than our pristine
store... Merge always normalizes EOL to '\n' for any svn:eol-style, while our pristine handling
only does that for 'native' and '\n' itself.
+  . ### Bert says: Merge uses a different kind of repository normal form than our pristine
store... Merge always normalizes EOL to '\n' for any svn:eol-style, while our pristine handling
only does that for 'native' and '\n' itself.
  
  Note [1]: A symlink doesn't have any on-disk attributes of its own on typical Unix-style
filesystems so I imagine Subversion shouldn't be trying to change them. However, when checked
out on a system that doesn't support symlinks, it becomes a normal file, and maybe then we
apply the attributes.
+ 
+ Note [2]: The WC merge code has 'binary' overriding 'special': see detranslate_wc_file().
Don't know if everywhere does the same.
  
  === Text Merge ===
   . ### ...

Mime
View raw message