view tests/test-convert-svn-tags @ 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/tags.svndump" | svnadmin load svn-repo > /dev/null

echo % convert
hg convert --datesort svn-repo A-hg

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

echo % convert without tags
hg convert --datesort --config convert.svn.tags= svn-repo A-notags-hg
hg -R A-notags-hg tags -q