Mercurial > hgsubversion
view tests/fixtures/branch_prop_edit.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 | cf6fe8457570 |
children |
line wrap: on
line source
#!/bin/sh mkdir temp cd temp svnadmin create repo svn co file://`pwd`/repo wc cd wc mkdir branches trunk svn add * svn ci -m 'branches trunk' svn up cd trunk for a in alpha beta gamma ; do echo $a > $a svn add $a done svn ci -m 'Files.' cd .. svn up svn cp trunk branches/dev_branch svn ci -m 'make a branch' svn up cd branches/dev_branch echo epsilon > epsilon svn add epsilon svn ci -m 'Add a file on the branch.' svn up cd ../.. cd branches/dev_branch svn ps 'svn:ignore' 'delta' . svn ci -m 'Commit bogus propchange.' svn up cd ../../.. pwd svnadmin dump repo > ../branch_prop_edit.svndump cd .. echo 'Dump created in branch_prop_edit.svndump. You can probably delete temp.' exit 0