view tests/fixtures/simple_branch.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 bb00f7ca5b8c
children
line wrap: on
line source

#!/bin/sh
#
# Generate simple_branch.svndump
#

mkdir temp
cd temp

mkdir project-orig
cd project-orig
mkdir trunk branches tags
cd ..

svnadmin create testrepo
svnurl=file://`pwd`/testrepo
svn import --username durin project-orig $svnurl -m "Empty dirs."

svn co $svnurl project
cd project
echo 'file: alpha' > trunk/alpha
svn add trunk/alpha
svn ci --username durin -m 'Add alpha'
echo 'Data of beta' > trunk/beta
svn add trunk/beta
svn ci --username durin -m 'Add beta'
svn up
svn cp trunk branches/the_branch
svn ci --username durin -m 'Make a branch'
cd ..

svnadmin dump testrepo > ../simple_branch.svndump