Mercurial > hgsubversion
annotate tests/fixtures/copies.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 | 64d961130a07 |
children |
rev | line source |
---|---|
960
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
1 #!/bin/sh |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
2 # |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
3 # Generate copies.svndump |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
4 # |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
5 |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
6 rm -rf temp |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
7 mkdir temp |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
8 cd temp |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
9 mkdir -p import/trunk/dir |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
10 echo a > import/trunk/dir/a |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
11 |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
12 svnadmin create testrepo |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
13 svnurl=file://`pwd`/testrepo |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
14 svn import import $svnurl -m init |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
15 |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
16 svn co $svnurl project |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
17 cd project |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
18 svn cp trunk/dir trunk/dir2 |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
19 echo b >> trunk/dir2/a |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
20 svn ci -m 'copy/edit trunk/dir/a' |
962
8648ccfb8325
editor: process missing files with regular files
Patrick Mezard <patrick@mezard.eu>
parents:
960
diff
changeset
|
21 svn up |
8648ccfb8325
editor: process missing files with regular files
Patrick Mezard <patrick@mezard.eu>
parents:
960
diff
changeset
|
22 svn cp trunk/dir2 trunk/dir3 |
8648ccfb8325
editor: process missing files with regular files
Patrick Mezard <patrick@mezard.eu>
parents:
960
diff
changeset
|
23 svn ci -m 'copy dir2 to dir3' |
963
64d961130a07
editor: do not record invalid path deletion
Patrick Mezard <patrick@mezard.eu>
parents:
962
diff
changeset
|
24 svn rm trunk/dir3/a |
64d961130a07
editor: do not record invalid path deletion
Patrick Mezard <patrick@mezard.eu>
parents:
962
diff
changeset
|
25 svn cp trunk/dir2/a trunk/dir3/a |
64d961130a07
editor: do not record invalid path deletion
Patrick Mezard <patrick@mezard.eu>
parents:
962
diff
changeset
|
26 svn ci -m 'copy and remove' |
960
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
27 cd .. |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
28 |
502613f6b583
editor: ignore added or copied files excluded by a filemap
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
29 svnadmin dump testrepo > ../copies.svndump |