##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r6159:bc784304 default
r12315:ca58f647 merge default
Show More
test-mq-pull-from-bundle
83 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-mq-pull-from-bundle
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
r5664 #!/bin/sh
Lee Cantey
Switch to using cat with EOF doc instead of trying to quote newlines for echo.
r5686 cat <<EOF >> $HGRCPATH
[extensions]
mq=
[defaults]
log = --template "{rev}: {desc}\\n"
heads = --template "{rev}: {desc}\\n"
incoming = --template "{rev}: {desc}\\n"
EOF
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
r5664
echo "====== Setup main"
hg init base
cd base
echo "One" > one
hg add
hg ci -m "main: one added."
echo "++" >> one
hg ci -m "main: one updated."
echo "====== Bundle main"
hg bundle --base=null ../main.hg
cd ..
echo "====== Incoming to fresh repo"
hg init fresh
echo ">> hg -R fresh incoming main.hg"
hg -R fresh incoming main.hg
echo ">> hg -R fresh incoming bundle:fresh+main.hg"
hg -R fresh incoming bundle:fresh+main.hg
echo "====== Setup queue"
cd base
hg qinit -c
hg qnew -m "patch: two added." two.patch
echo two > two
hg add
hg qrefresh
hg qcommit -m "queue: two.patch added."
hg qpop -a
echo "====== Bundle queue"
hg -R .hg/patches bundle --base=null ../queue.hgq
cd ..
echo "====== Clone base"
hg clone base copy
cd copy
hg qinit -c
echo "====== Incoming queue bundle"
echo ">> hg -R .hg/patches incoming ../queue.hgq"
hg -R .hg/patches incoming ../queue.hgq
echo "====== Pull queue bundle"
echo ">> hg -R .hg/patches pull --update ../queue.hgq"
hg -R .hg/patches pull --update ../queue.hgq
echo ">> hg -R .hg/patches heads"
hg -R .hg/patches heads
echo ">> hg -R .hg/patches log"
hg -R .hg/patches log
echo ">> hg qseries"
hg qseries
cd ..
echo "====== Clone base again"
hg clone base copy2
cd copy2
hg qinit -c
echo "====== Unbundle queue bundle"
echo ">> hg -R .hg/patches unbundle --update ../queue.hgq"
hg -R .hg/patches unbundle --update ../queue.hgq
echo ">> hg -R .hg/patches heads"
hg -R .hg/patches heads
echo ">> hg -R .hg/patches log"
hg -R .hg/patches log
echo ">> hg qseries"
hg qseries
cd ..