Mercurial > hgsubversion
view tests/fixtures/corrupt.svndump @ 920:1be4ea4f3c0d
stupid: diff with the good revision when restoring branch
Converting history like:
r1 create trunk
r2 remove trunk
r3 make some unrelated commit
r4 restore trunk from r2
stupid mode would retrieve and apply the diff with r3 instead of the
one with r2. All the code deciding r2 is the actual parent was already
there, only the revision argument was not passed.
This fixes:
- test_delete_restore_trunk in comprehensive/test_stupid_pull.py
- test_delete_restore_trunk_stupid in comprehensive/test_verify_and_startrev.py
Tested on OSX 10.6 with macports svn-1.7.5. I can no longer test with
svn-1.6.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sun, 29 Jul 2012 13:13:56 +0200 |
| parents | 3bfb7e985c47 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 00000000-0000-0000-0000-000000000000 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-11-30T15:10:25.898546Z PROPS-END Revision-number: 1 Prop-content-length: 100 Content-length: 100 K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-11-30T15:16:01.077550Z K 7 svn:log V 0 PROPS-END Node-path: another-regular-file Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 0 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 Content-length: 10 PROPS-END Node-path: executable-file Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 11 Text-content-md5: 01839ba8c81c3b2c7486607e0c683e62 Text-content-sha1: 5e70f8a25fe8ad4ad971bfd3388c258b019268d4 Content-length: 21 PROPS-END Executable Node-path: missing-file Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 0 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 Content-length: 10 PROPS-END Node-path: regular-file Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 18 Text-content-md5: adf66a0cec83e25644c63f3c3007ae7c Text-content-sha1: 047e6e482d0c9cb812f89d18a9f07a43caab76bb Content-length: 51 K 11 svn:special V 1 * PROPS-END link Bad contents. Node-path: symlink Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 1 Text-content-md5: 7fc56270e7a70fa81a5935b72eacbe29 Text-content-sha1: 6dcd4ce23d88e2ee9568ba546c007c63d9131c1b Content-length: 11 PROPS-END A