Mercurial > hgsubversion
view tests/fixtures/test_no_dates.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 | c90cfa665b81 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 3b9ee152-ff20-493a-9d97-5d739715df90 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2009-04-08T10:33:20.055686Z PROPS-END Revision-number: 1 Prop-content-length: 55 Content-length: 55 K 7 svn:log V 4 init K 10 svn:author V 3 djc 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: 56 Content-length: 56 K 7 svn:log V 5 add a K 10 svn:author V 3 djc PROPS-END Node-path: trunk/a Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 Content-length: 12 PROPS-END a Revision-number: 3 Prop-content-length: 98 Content-length: 98 K 7 svn:log V 1 b K 10 svn:author V 3 djc K 8 svn:date V 27 2009-04-08T10:35:21.843827Z PROPS-END Node-path: trunk/a Node-kind: file Node-action: change Text-content-length: 3 Text-content-md5: daa8075d6ac5ff8d0c6d4650adb4ef29 Content-length: 3 ab Revision-number: 4 Prop-content-length: 52 Content-length: 52 K 7 svn:log V 1 c K 10 svn:author V 3 djc PROPS-END Node-path: trunk/a Node-kind: file Node-action: change Text-content-length: 4 Text-content-md5: 0bee89b07a248e27c83fc3d5951213c1 Content-length: 4 abc