Mercurial > hgsubversion
diff tests/fixtures/renames_with_prefix.sh @ 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 | tests/fixtures/renames.sh@0d0132cba155 |
| children |
line wrap: on
line diff
copy from tests/fixtures/renames.sh copy to tests/fixtures/renames_with_prefix.sh --- a/tests/fixtures/renames.sh +++ b/tests/fixtures/renames_with_prefix.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Generate renames.svndump +# Generate renames_with_prefix.svndump # set -e @@ -10,15 +10,16 @@ rm -rf temp mkdir temp cd temp -mkdir project-orig -cd project-orig +mkdir -p project-orig/prefix +cd project-orig/prefix mkdir trunk mkdir branches -cd .. +cd ../.. svnadmin create testrepo svnurl=file://`pwd`/testrepo svn import project-orig $svnurl -m "init project" +svnurl=$svnurl/prefix svn co $svnurl project cd project/trunk @@ -138,4 +139,4 @@ svn cp $svnurl/trunk/groupdir@2 groupdir svn ci -m "copy groupdir from the past" cd ../.. -svnadmin dump testrepo > ../renames.svndump +svnadmin dump testrepo > ../renames_with_prefix.svndump