Mercurial > hgsubversion
view tests/fixtures/executable_file_empty_prop.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 | 5497d1264b4d |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 60adb0cc-4d5c-4038-bbb4-90f4595cf81c Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2008-11-25T15:02:16.557895Z PROPS-END Revision-number: 1 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 15 Basic structure K 10 svn:author V 5 Augie K 8 svn:date V 27 2008-11-25T15:02:45.454954Z 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: 103 Content-length: 103 K 7 svn:log V 4 blah K 10 svn:author V 5 Augie K 8 svn:date V 27 2008-11-25T15:03:45.151223Z PROPS-END Node-path: trunk/foo Node-kind: file Node-action: add Prop-content-length: 36 Text-content-length: 4 Text-content-md5: c157a79031e1c40f85931829bc5fc552 Content-length: 40 K 14 svn:executable V 0 PROPS-END bar