Mercurial > public > mercurial-scm > hg
diff tests/test-mq-merge @ 6628:f18f14bae172
test-mq-merge: test mq merge and explicit patch queue
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 24 May 2008 18:11:34 +0200 |
parents | 0b3f910dfd17 |
children | bb5ea66789e3 7637fe4f525d |
line wrap: on
line diff
--- a/tests/test-mq-merge Thu May 08 14:02:42 2008 +1000 +++ b/tests/test-mq-merge Sat May 24 18:11:34 2008 +0200 @@ -49,3 +49,25 @@ # ensure status is correct after merge hg qpop -a +cd .. + +# Classic MQ merge sequence *with an explicit named queue* +echo +echo % init t2 +hg init t2 +cd t2 +echo a > a +hg ci -Am init +echo b >> a +hg ci -m changea +hg up -C 0 +echo c >> a +hg qnew -f -e patcha +echo % create the reference queue +hg qsave -c -e -n refqueue 2> /dev/null +hg up -C 1 +echo % merge +hg qpush -m -n refqueue 2>&1 | \ + sed 's/merging with queue at.*refqueue/merging with queue at refqueue/' +cd .. +