view tests/test-convert-svn-branches @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes

Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches.  Minor change to abort message if
uncommitted changes are found.

Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.

#!/bin/sh

"$TESTDIR/hghave" svn svn-bindings || exit 80

fix_path()
{
    tr '\\' /
}

echo "[extensions]" >> $HGRCPATH
echo "convert = " >> $HGRCPATH
echo "hgext.graphlog =" >> $HGRCPATH

svnadmin create svn-repo
cat "$TESTDIR/svn/branches.svndump" | svnadmin load svn-repo > /dev/null

echo % convert trunk and branches
cat >branchmap <<EOF
old3 newbranch
EOF
hg convert --branchmap=branchmap --datesort -r 10 svn-repo A-hg

echo % convert again
hg convert --branchmap=branchmap --datesort svn-repo A-hg

cd A-hg
hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'
hg branches | sed 's/:.*/:/'
hg tags -q
cd ..

echo '% test hg failing to call itself'
HG=foobar hg convert svn-repo B-hg 2>&1 | grep -v foobar