diff tests/test-mq-safety.out @ 10362:2e3ec7ef5349

mq: don't warn on qpush against a branch head
author Dirkjan Ochtman <djc.ochtman@kentyde.com>
date Sun, 07 Feb 2010 14:06:05 +0100
parents 6d891df43a5f
children 5b48d819d5f9
line wrap: on
line diff
--- a/tests/test-mq-safety.out	Sun Feb 07 13:49:52 2010 +0100
+++ b/tests/test-mq-safety.out	Sun Feb 07 14:06:05 2010 +0100
@@ -12,3 +12,37 @@
 abort: cannot refresh a revision with children
 % tip:
 3 append quux
+% qpush warning branchheads
+popping qp
+patch queue now empty
+adding a
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+marked working directory as branch b
+adding c
+created new head
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+changeset:   2:65309210bf4e
+branch:      b
+tag:         tip
+parent:      1:707adb4c8ae1
+parent:      0:cb9a9f314b8b
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     merge
+
+changeset:   1:707adb4c8ae1
+branch:      b
+parent:      -1:000000000000
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     c
+
+changeset:   0:cb9a9f314b8b
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     a
+
+applying qp
+now at: qp