# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1211645494 -7200
# Node ID f18f14bae172614a0212b45d99d574d579e95070
# Parent  d9266e48cd27cb229843effe6bd1d0a3becd3ab5
test-mq-merge: test mq merge and explicit patch queue

diff -r d9266e48cd27 -r f18f14bae172 tests/test-mq-merge
--- 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 ..
+
diff -r d9266e48cd27 -r f18f14bae172 tests/test-mq-merge.out
--- a/tests/test-mq-merge.out	Thu May 08 14:02:42 2008 +1000
+++ b/tests/test-mq-merge.out	Sat May 24 18:11:34 2008 +0200
@@ -11,3 +11,14 @@
 Now at: rm_a
 b
 Patch queue now empty
+
+% init t2
+adding a
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+% create the reference queue
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+% merge
+merging with queue at refqueue
+(working directory not at tip)
+applying patcha
+Now at: patcha