Mercurial > hgsubversion
view tests/fixtures/non_ascii_path_1.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 | ae5968ffe6fe |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: a7b92ce5-70a8-4e75-99da-c3ca360ae490 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-08-16T13:08:38.494252Z PROPS-END Revision-number: 1 Prop-content-length: 121 Content-length: 121 K 7 svn:log V 20 Create project bøb. K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-08-16T13:10:12.395716Z PROPS-END Node-path: bøb Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: bøb/branches Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: bøb/tags Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: bøb/trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: bøb/trunk/A Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 1 Text-content-md5: 68b329da9893e34099c7d8ad5cb9c940 Text-content-sha1: adc83b19e793491b1c6ea0fd8b46cd9f32e592fc Content-length: 11 PROPS-END Revision-number: 2 Prop-content-length: 112 Content-length: 112 K 7 svn:log V 11 Add a file. K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-08-16T14:04:00.624391Z PROPS-END Node-path: bøb/trunk/B Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 1 Text-content-md5: 68b329da9893e34099c7d8ad5cb9c940 Text-content-sha1: adc83b19e793491b1c6ea0fd8b46cd9f32e592fc Content-length: 11 PROPS-END