Mercurial > hg
view tests/test-merge6 @ 11767:9b771b4ce2f3
mq/qqueue: --list does not print (active) with --quiet
For scripting purposes, it can be convenient to get a simple listing of
available queues, without indication of the active one.
--quiet documentation change removed by Patrick Mézard.
author | "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
---|---|
date | Sun, 08 Aug 2010 22:49:01 +0200 |
parents | a74586023196 |
children |
line wrap: on
line source
#!/bin/sh cat <<EOF > merge import sys, os print "merging for", os.path.basename(sys.argv[1]) EOF HGMERGE="python ../merge"; export HGMERGE mkdir A1 cd A1 hg init echo This is file foo1 > foo echo This is file bar1 > bar hg add foo bar hg commit -m "commit text" -d "1000000 0" cd .. hg clone A1 B1 cd A1 rm bar hg remove bar hg commit -m "commit test" -d "1000000 0" cd ../B1 echo This is file foo22 > foo hg commit -m "commit test" -d "1000000 0" cd .. hg clone A1 A2 hg clone B1 B2 cd A1 hg pull ../B1 hg merge hg commit -m "commit test" -d "1000000 0" echo bar should remain deleted. hg manifest --debug cd ../B2 hg pull ../A2 hg merge hg commit -m "commit test" -d "1000000 0" echo bar should remain deleted. hg manifest --debug