diff hgsubversion/editor.py @ 1234:d3c79072bc6a

editor: correctly import symlink copy+modify with non-empty prefix We alwasy fail editing for symlinks, since we strip the leading 'link ' subversion includes when storing in mercurial, and then let svn attempt to apply deltas against the stripped version. This unsurprisingly fails, and we write the resulting empty-string to the Filestore for the current revision, and add the symlink in question to the missing list to handle stupidly later. Unfortunately, this would break down because editing adds files to the store using their absolute path whereas missing files are added relative to our subdir. the absolut path file appears to win, which results in us getting a symlink whose target is the empty string. This fixes the problem by adding missing files to the fileStore using their absolute path.
author David Schleimer <dschleimer@fb.com>
date Mon, 07 Apr 2014 18:28:35 -0700
parents 0d0132cba155
children 6b15eeb78c1a
line wrap: on
line diff
--- a/hgsubversion/editor.py
+++ b/hgsubversion/editor.py
@@ -651,7 +651,7 @@ class HgEditor(svnwrap.Editor):
                     svn.init_ra_and_client()
                 i += 1
                 data, mode = svn.get_file(f, rev)
-                self.current.set(f, data, 'x' in mode, 'l' in mode)
+                self.current.set(root + f, data, 'x' in mode, 'l' in mode)
             if not self.ui.debugflag:
                 self.ui.note('\n')