Mercurial > hgsubversion
view tests/fixtures/delete_restore_trunk.svndump @ 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 | c4ee11a5d04c |
children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: fca176f4-a346-479b-ae2c-78c8442c3809 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2012-05-16T22:55:55.613464Z PROPS-END Revision-number: 1 Prop-content-length: 103 Content-length: 103 K 7 svn:log V 3 btt K 10 svn:author V 6 bryano K 8 svn:date V 27 2012-05-16T22:55:56.081065Z PROPS-END Node-path: branches Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: tags Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 108 Content-length: 108 K 7 svn:log V 8 add file K 10 svn:author V 6 bryano K 8 svn:date V 27 2012-05-16T22:55:57.071178Z PROPS-END Node-path: trunk/foo Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 4 Text-content-md5: d3b07384d113edec49eaa6238ad5ff00 Text-content-sha1: f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 Content-length: 14 PROPS-END foo Revision-number: 3 Prop-content-length: 113 Content-length: 113 K 7 svn:log V 12 delete trunk K 10 svn:author V 6 bryano K 8 svn:date V 27 2012-05-16T22:55:59.058026Z PROPS-END Node-path: trunk Node-action: delete Revision-number: 4 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 13 restore trunk K 10 svn:author V 6 bryano K 8 svn:date V 27 2012-05-16T22:56:01.055887Z PROPS-END Node-path: trunk Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 5 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 14 append to file K 10 svn:author V 6 bryano K 8 svn:date V 27 2012-05-16T22:56:02.060991Z PROPS-END Node-path: trunk/foo Node-kind: file Node-action: change Text-content-length: 8 Text-content-md5: f47c75614087a8dd938ba4acff252494 Text-content-sha1: 4e48e2c9a3d2ca8a708cb0cc545700544efb5021 Content-length: 8 foo bar