Fix tests failures introduced by 7239e06e58e9

tests/test-convert-baz

@@ -1,72 +1,73
 #!/bin/sh
 
 "$TESTDIR/hghave" baz || exit 80
 
 mkdir do_not_use_HOME_baz
 cd do_not_use_HOME_baz
 HOME=`pwd`; export HOME
 cd ..
 baz my-id "mercurial <[e-mail]>"
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 
 echo % create baz archive
 baz make-archive baz@mercurial--convert hg-test-convert-baz
 
 echo % initialize baz repo
 mkdir baz-repo
 cd baz-repo/
 baz init-tree baz@mercurial--convert/baz--test--0
 baz import
 
 echo % create initial files
 echo 'this is a file' > a
 baz add a
 mkdir src
 baz add src
 cd src
 dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null
 baz add b
 baz commit -s "added a file, src and src/b (binary)"
 
 echo % create link file and modify a
 ln -s ../a a-link
 baz add a-link
 echo 'this a modification to a' >> ../a
 baz commit -s "added link to a and modify a"
 
 echo % create second link and modify b
 ln -s ../a a-link-2
 baz add a-link-2
 dd count=1 seek=1 if=/dev/zero of=b > /dev/null 2> /dev/null
 baz commit -s "added second link and modify b"
 
 echo % b file to link and a-link-2 to regular file
 rm -f a-link-2
 echo 'this is now a regular file' > a-link-2
 ln -sf ../a b
 baz commit -s "file to link and link to file test"
 
 echo % move a-link-2 file and src directory
 cd ..
 baz mv src/a-link-2 c
 baz mv src test
 baz commit -s "move and rename a-link-2 file and src directory"
 
 cd ..
 
 echo % converting baz repo to Mercurial
 hg convert baz-repo baz-repo-hg
 
 baz register-archive -d baz@mercurial--convert
 
 glog()
 {
     hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
 }
 
 echo % show graph log
 glog -R baz-repo-hg
+hg up -q -R baz-repo-hg
 hg -R baz-repo-hg manifest --debug

tests/test-convert-darcs

@@ -1,61 +1,62
 #!/bin/sh
 
 "$TESTDIR/hghave" darcs || exit 80
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 
 DARCS_EMAIL='[e-mail]'; export DARCS_EMAIL
 HOME=do_not_use_HOME_darcs; export HOME
 
 # skip if we can't import elementtree
 mkdir dummy
 mkdir dummy/_darcs
 if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then
     echo 'skipped: missing feature: elementtree module'
     exit 80
 fi
 
 echo % initialize darcs repo
 mkdir darcs-repo
 cd darcs-repo
 darcs init
 echo a > a
 darcs record -a -l -m p0
 cd ..
 
 echo % branch and update
 darcs get darcs-repo darcs-clone >/dev/null
 cd darcs-clone
 echo c >> a
 echo c > c
 darcs record -a -l -m p1.1
 cd ..
 
 echo % update source
 cd darcs-repo
 echo b >> a
 echo b > b
 darcs record -a -l -m p1.2
 
 echo % merge branch
 darcs pull -a ../darcs-clone
 echo e > a
 darcs record -a -l -m p2
 cd ..
 
 glog()
 {
     hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
 }
 
 hg convert darcs-repo darcs-repo-hg 2>&1 | grep -v hGetLine | grep -v '^$'
 # The converter does not currently handle patch conflicts very well.
 # When they occur, it reverts *all* changes and moves forward,
 # letting the conflict resolving patch fix collisions.
 # Unfortunately, non-conflicting changes, like the addition of the
 # "c" file in p1.1 patch are reverted too.
 # Just to say that manifest not listing "c" here is a bug.
 glog -R darcs-repo-hg
+hg up -q -R darcs-repo-hg
 hg -R darcs-repo-hg manifest --debug

tests/test-convert-tla

@@ -1,72 +1,73
 #!/bin/sh
 
 "$TESTDIR/hghave" tla || exit 80
 
 mkdir do_not_use_HOME_tla
 cd do_not_use_HOME_tla
 HOME=`pwd`; export HOME
 cd ..
 tla my-id "mercurial <[e-mail]>"
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 
 echo % create tla archive
 tla make-archive tla@mercurial--convert `pwd`/hg-test-convert-tla
 
 echo % initialize tla repo
 mkdir tla-repo
 cd tla-repo/
 tla init-tree tla@mercurial--convert/tla--test--0
 tla import
 
 echo % create initial files
 echo 'this is a file' > a
 tla add a
 mkdir src
 tla add src
 cd src
 dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null
 tla add b
 tla commit -s "added a file, src and src/b (binary)"
 
 echo % create link file and modify a
 ln -s ../a a-link
 tla add a-link
 echo 'this a modification to a' >> ../a
 tla commit -s "added link to a and modify a"
 
 echo % create second link and modify b
 ln -s ../a a-link-2
 tla add a-link-2
 dd count=1 seek=1 if=/dev/zero of=b > /dev/null 2> /dev/null
 tla commit -s "added second link and modify b"
 
 echo % b file to link and a-link-2 to regular file
 rm -f a-link-2
 echo 'this is now a regular file' > a-link-2
 ln -sf ../a b
 tla commit -s "file to link and link to file test"
 
 echo % move a-link-2 file and src directory
 cd ..
 tla mv src/a-link-2 c
 tla mv src test
 tla commit -s "move and rename a-link-2 file and src directory"
 
 cd ..
 
 echo % converting tla repo to Mercurial
 hg convert tla-repo tla-repo-hg
 
 tla register-archive -d tla@mercurial--convert
 
 glog()
 {
     hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
 }
 
 echo % show graph log
 glog -R tla-repo-hg
+hg up -q -R tla-repo-hg
 hg -R tla-repo-hg manifest --debug