Mercurial > hg
view tests/test-convert-svn-move @ 6522:2b181fb3a70a
use internal merge tool when specified for a merge-pattern in hgrc
It is possible to specify in the hgrc file that one of the internal merge
tools (internal:fail, internal:local or internal:other) be used for
performing merges on files matching a given pattern. However, this setting
is not being acted upon (the merge tool is not found). This patch fixes that.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:21:53 +0300 |
parents | c1b47c0fd2b6 |
children | a6e2e60b34d0 |
line wrap: on
line source
#!/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 svnpath=`pwd | fix_path` # SVN wants all paths to start with a slash. Unfortunately, # Windows ones don't. Handle that. expr $svnpath : "\/" > /dev/null if [ $? -ne 0 ]; then svnpath='/'$svnpath fi echo % initial svn import mkdir projA cd projA mkdir trunk echo a > trunk/a mkdir trunk/d1 echo b > trunk/d1/b echo c > trunk/d1/c cd .. svnurl=file://$svnpath/svn-repo/projA svn import -m "init projA" projA $svnurl | fix_path # Build a module renaming chain which used to confuse the converter. echo % update svn repository svn co $svnurl A | fix_path cd A "$TESTDIR/svn-safe-append.py" a trunk/a "$TESTDIR/svn-safe-append.py" c trunk/d1/c svn ci -m commitbeforemove svn mv $svnurl/trunk $svnurl/subproject -m movedtrunk svn up mkdir subproject/trunk svn add subproject/trunk svn ci -m createtrunk mkdir subproject/branches svn add subproject/branches svn ci -m createbranches svn mv $svnurl/subproject/d1 $svnurl/subproject/trunk/d1 -m moved1 svn up "$TESTDIR/svn-safe-append.py" b subproject/trunk/d1/b svn ci -m changeb svn mv $svnurl/subproject/trunk/d1 $svnurl/subproject/branches/d1 -m moved1again cd .. echo % convert trunk and branches hg convert --datesort $svnurl/subproject A-hg cd A-hg hg glog --template '#rev# #desc|firstline# files: #files#\n' hg branches | sed 's/:.*/:/' cd ..