Mercurial > hgsubversion
view tests/fixtures/delentries.sh @ 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 | 19aabf67c792 |
children |
line wrap: on
line source
#!/bin/sh # # Generate delentries.svndump # mkdir temp cd temp mkdir project-orig cd project-orig mkdir trunk cd .. svnadmin create testrepo svnurl=file://`pwd`/testrepo svn import project-orig $svnurl -m "init project" svn co $svnurl project cd project/trunk # Regular file deletion echo a > a # Another file starting like the deleted file echo aa > aa mkdir d1 mkdir d1/d2 mkdir d1/d2/d3 echo c > d1/c # Test directory deletion echo d > d1/d2/c # Test subdirectory deletion echo e > d1/d2/d3/e echo f > d1/d2/d3/f # This file starts as the deleted directory, can be confusing echo d2prefix > d1/d2prefix svn add a aa d1 svn ci -m "add entries" svn rm a d1/d2 svn ci -m "remove entries" cd ../.. svnadmin dump testrepo > ../delentries.svndump