Mercurial > hg

annotate tests/test-mq-header-from.t @ 17820:c547e1acc37c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tag: disallow '\0' in tag names This brings the list of disallowed characters in line with bookmarks.
author Kevin Bullock <kbullock@ringworld.org>
date Wed, 17 Oct 2012 21:39:07 -0500
parents f2719b387380
children c87f2a5a6e49
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10397
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 7627
diff changeset
1
12462
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
2 $ echo "[extensions]" >> $HGRCPATH
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
3 $ echo "mq=" >> $HGRCPATH
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
4 $ echo "[diff]" >> $HGRCPATH
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
5 $ echo "nodates=true" >> $HGRCPATH
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
6 $ catlog() {
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
7 > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
8 > -e "s/^\(# Parent \).*/\1/"
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
9 > hg log --template "{rev}: {desc} - {author}\n"
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
10 > }
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
11 $ runtest() {
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
12 > echo ==== init
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
13 > hg init a
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
14 > cd a
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
15 > hg qinit
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
16 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
17 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
18 > echo ==== qnew -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
19 > hg qnew -U 1.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
20 > catlog 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
21 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
22 > echo ==== qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
23 > echo "1" >1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
24 > hg add
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
25 > hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
26 > catlog 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
27 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
28 > echo ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
29 > hg qref -u mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
30 > catlog 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
31 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
32 > echo ==== qnew
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
33 > hg qnew 2.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
34 > echo "2" >2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
35 > hg add
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
36 > hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
37 > catlog 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
38 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
39 > echo ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
40 > hg qref -u jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
41 > catlog 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
42 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
43 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
44 > echo ==== qnew -U -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
45 > hg qnew -U -m "Three" 3.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
46 > catlog 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
47 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
48 > echo ==== qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
49 > echo "3" >3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
50 > hg add
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
51 > hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
52 > catlog 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
53 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
54 > echo ==== qref -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
55 > hg qref -m "Drei"
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
56 > catlog 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
57 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
58 > echo ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
59 > hg qref -u mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
60 > catlog 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
61 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
62 > echo ==== qref -u -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
63 > hg qref -u maria -m "Three (again)"
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
64 > catlog 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
65 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
66 > echo ==== qnew -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
67 > hg qnew -m "Four" 4.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
68 > echo "4" >4of t
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
69 > hg add
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
70 > hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
71 > catlog 4
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
72 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
73 > echo ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
74 > hg qref -u jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
75 > catlog 4
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
76 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
77 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
78 > echo ==== qnew with HG header
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
79 > hg qnew --config 'mq.plain=true' 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
80 > hg qpop
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
81 > echo "# HG changeset patch" >>.hg/patches/5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
82 > echo "# User johndoe" >>.hg/patches/5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
83 > hg qpush 2>&1 | grep 'now at'
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
84 > catlog 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
85 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
86 > echo ==== hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
87 > echo "5" >5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
88 > hg add
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
89 > hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
90 > catlog 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
91 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
92 > echo ==== hg qref -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
93 > hg qref -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
94 > catlog 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
95 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
96 > echo ==== hg qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
97 > hg qref -u johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
98 > catlog 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
99 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
100 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
101 > echo ==== qnew with plain header
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
102 > hg qnew --config 'mq.plain=true' -U 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
103 > hg qpop
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
104 > hg qpush 2>&1 | grep 'now at'
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
105 > catlog 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
106 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
107 > echo ==== hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
108 > echo "6" >6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
109 > hg add
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
110 > hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
111 > catlog 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
112 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
113 > echo ==== hg qref -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
114 > hg qref -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
115 > catlog 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
116 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
117 > echo ==== hg qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
118 > hg qref -u johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
119 > catlog 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
120 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
121 >
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
122 > echo ==== "qpop -a / qpush -a"
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
123 > hg qpop -a
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
124 > hg qpush -a
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
125 > hg log --template "{rev}: {desc} - {author}\n"
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
126 > }
10397
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 7627
diff changeset
127
12462
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
128 ======= plain headers
10397
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 7627
diff changeset
129
12462
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
130 $ echo "[mq]" >> $HGRCPATH
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
131 $ echo "plain=true" >> $HGRCPATH
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
132 $ mkdir sandbox
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
133 $ (cd sandbox ; runtest)
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
134 ==== init
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
135 ==== qnew -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
136 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
137
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
138 0: [mq]: 1.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
139 ==== qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
140 adding 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
141 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
142
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
143 diff -r ... 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
144 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
145 +++ b/1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
146 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
147 +1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
148 0: [mq]: 1.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
149 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
150 From: mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
151
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
152 diff -r ... 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
153 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
154 +++ b/1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
155 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
156 +1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
157 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
158 ==== qnew
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
159 adding 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
160 diff -r ... 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
161 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
162 +++ b/2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
163 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
164 +2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
165 1: [mq]: 2.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
166 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
167 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
168 From: jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
169
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
170 diff -r ... 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
171 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
172 +++ b/2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
173 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
174 +2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
175 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
176 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
177 ==== qnew -U -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
178 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
179
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
180 Three
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
181
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
182 2: Three - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
183 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
184 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
185 ==== qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
186 adding 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
187 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
188
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
189 Three
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
190
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
191 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
192 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
193 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
194 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
195 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
196 2: Three - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
197 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
198 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
199 ==== qref -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
200 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
201
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
202 Drei
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
203
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
204 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
205 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
206 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
207 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
208 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
209 2: Drei - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
210 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
211 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
212 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
213 From: mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
214
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
215 Drei
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
216
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
217 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
218 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
219 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
220 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
221 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
222 2: Drei - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
223 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
224 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
225 ==== qref -u -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
226 From: maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
227
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
228 Three (again)
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
229
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
230 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
231 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
232 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
233 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
234 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
235 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
236 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
237 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
238 ==== qnew -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
239 adding 4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
240 Four
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
241
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
242 diff -r ... 4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
243 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
244 +++ b/4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
245 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
246 +4 t
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
247 3: Four - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
248 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
249 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
250 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
251 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
252 From: jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
253 Four
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
254
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
255 diff -r ... 4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
256 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
257 +++ b/4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
258 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
259 +4 t
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
260 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
261 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
262 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
263 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
264 ==== qnew with HG header
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
265 popping 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
266 now at: 4.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
267 now at: 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
268 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
269 # User johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
270 4: imported patch 5.patch - johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
271 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
272 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
273 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
274 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
275 ==== hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
276 adding 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
277 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
278 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
279 # User johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
280
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
281 diff -r ... 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
282 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
283 +++ b/5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
284 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
285 +5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
286 4: [mq]: 5.patch - johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
287 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
288 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
289 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
290 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
291 ==== hg qref -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
292 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
293 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
294 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
295
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
296 diff -r ... 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
297 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
298 +++ b/5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
299 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
300 +5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
301 4: [mq]: 5.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
302 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
303 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
304 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
305 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
306 ==== hg qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
307 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
308 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
309 # User johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
310
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
311 diff -r ... 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
312 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
313 +++ b/5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
314 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
315 +5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
316 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
317 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
318 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
319 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
320 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
321 ==== qnew with plain header
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
322 popping 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
323 now at: 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
324 now at: 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
325 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
326
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
327 5: imported patch 6.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
328 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
329 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
330 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
331 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
332 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
333 ==== hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
334 adding 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
335 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
336
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
337 diff -r ... 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
338 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
339 +++ b/6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
340 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
341 +6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
342 5: [mq]: 6.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
343 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
344 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
345 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
346 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
347 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
348 ==== hg qref -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
349 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
350
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
351 diff -r ... 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
352 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
353 +++ b/6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
354 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
355 +6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
356 5: [mq]: 6.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
357 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
358 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
359 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
360 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
361 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
362 ==== hg qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
363 From: johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
364
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
365 diff -r ... 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
366 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
367 +++ b/6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
368 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
369 +6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
370 5: [mq]: 6.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
371 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
372 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
373 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
374 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
375 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
376 ==== qpop -a / qpush -a
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
377 popping 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
378 popping 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
379 popping 4.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
380 popping 3.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
381 popping 2.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
382 popping 1.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
383 patch queue now empty
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
384 applying 1.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
385 applying 2.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
386 applying 3.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
387 applying 4.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
388 applying 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
389 applying 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
390 now at: 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
391 5: imported patch 6.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
392 4: imported patch 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
393 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
394 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
395 1: imported patch 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
396 0: imported patch 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
397 $ rm -r sandbox
10397
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 7627
diff changeset
398
12462
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
399 ======= hg headers
10397
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 7627
diff changeset
400
12462
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
401 $ echo "plain=false" >> $HGRCPATH
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
402 $ mkdir sandbox
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
403 $ (cd sandbox ; runtest)
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
404 ==== init
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
405 ==== qnew -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
406 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
407 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
408 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
409 0: [mq]: 1.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
410 ==== qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
411 adding 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
412 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
413 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
414 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
415
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
416 diff -r ... 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
417 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
418 +++ b/1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
419 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
420 +1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
421 0: [mq]: 1.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
422 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
423 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
424 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
425 # User mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
426
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
427 diff -r ... 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
428 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
429 +++ b/1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
430 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
431 +1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
432 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
433 ==== qnew
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
434 adding 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
435 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
436 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
437
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
438 diff -r ... 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
439 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
440 +++ b/2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
441 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
442 +2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
443 1: [mq]: 2.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
444 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
445 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
446 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
447 # User jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
448 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
449
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
450 diff -r ... 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
451 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
452 +++ b/2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
453 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
454 +2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
455 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
456 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
457 ==== qnew -U -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
458 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
459 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
460 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
461 Three
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
462
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
463 2: Three - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
464 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
465 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
466 ==== qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
467 adding 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
468 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
469 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
470 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
471 Three
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
472
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
473 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
474 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
475 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
476 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
477 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
478 2: Three - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
479 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
480 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
481 ==== qref -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
482 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
483 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
484 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
485 Drei
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
486
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
487 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
488 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
489 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
490 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
491 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
492 2: Drei - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
493 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
494 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
495 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
496 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
497 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
498 # User mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
499 Drei
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
500
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
501 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
502 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
503 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
504 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
505 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
506 2: Drei - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
507 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
508 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
509 ==== qref -u -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
510 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
511 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
512 # User maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
513 Three (again)
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
514
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
515 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
516 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
517 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
518 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
519 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
520 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
521 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
522 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
523 ==== qnew -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
524 adding 4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
525 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
526 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
527 Four
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
528
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
529 diff -r ... 4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
530 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
531 +++ b/4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
532 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
533 +4 t
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
534 3: Four - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
535 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
536 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
537 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
538 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
539 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
540 # User jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
541 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
542 Four
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
543
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
544 diff -r ... 4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
545 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
546 +++ b/4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
547 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
548 +4 t
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
549 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
550 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
551 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
552 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
553 ==== qnew with HG header
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
554 popping 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
555 now at: 4.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
556 now at: 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
557 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
558 # User johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
559 4: imported patch 5.patch - johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
560 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
561 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
562 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
563 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
564 ==== hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
565 adding 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
566 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
567 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
568 # User johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
569
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
570 diff -r ... 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
571 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
572 +++ b/5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
573 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
574 +5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
575 4: [mq]: 5.patch - johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
576 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
577 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
578 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
579 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
580 ==== hg qref -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
581 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
582 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
583 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
584
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
585 diff -r ... 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
586 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
587 +++ b/5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
588 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
589 +5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
590 4: [mq]: 5.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
591 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
592 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
593 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
594 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
595 ==== hg qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
596 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
597 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
598 # User johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
599
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
600 diff -r ... 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
601 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
602 +++ b/5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
603 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
604 +5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
605 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
606 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
607 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
608 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
609 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
610 ==== qnew with plain header
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
611 popping 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
612 now at: 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
613 now at: 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
614 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
615
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
616 5: imported patch 6.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
617 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
618 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
619 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
620 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
621 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
622 ==== hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
623 adding 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
624 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
625
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
626 diff -r ... 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
627 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
628 +++ b/6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
629 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
630 +6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
631 5: [mq]: 6.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
632 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
633 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
634 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
635 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
636 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
637 ==== hg qref -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
638 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
639
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
640 diff -r ... 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
641 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
642 +++ b/6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
643 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
644 +6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
645 5: [mq]: 6.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
646 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
647 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
648 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
649 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
650 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
651 ==== hg qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
652 From: johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
653
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
654 diff -r ... 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
655 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
656 +++ b/6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
657 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
658 +6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
659 5: [mq]: 6.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
660 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
661 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
662 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
663 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
664 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
665 ==== qpop -a / qpush -a
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
666 popping 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
667 popping 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
668 popping 4.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
669 popping 3.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
670 popping 2.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
671 popping 1.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
672 patch queue now empty
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
673 applying 1.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
674 applying 2.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
675 applying 3.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
676 applying 4.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
677 applying 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
678 applying 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
679 now at: 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
680 5: imported patch 6.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
681 4: imported patch 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
682 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
683 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
684 1: imported patch 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
685 0: imported patch 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
686 $ rm -r sandbox
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
687 $ runtest
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
688 ==== init
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
689 ==== qnew -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
690 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
691 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
692 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
693 0: [mq]: 1.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
694 ==== qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
695 adding 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
696 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
697 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
698 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
699
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
700 diff -r ... 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
701 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
702 +++ b/1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
703 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
704 +1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
705 0: [mq]: 1.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
706 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
707 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
708 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
709 # User mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
710
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
711 diff -r ... 1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
712 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
713 +++ b/1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
714 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
715 +1
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
716 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
717 ==== qnew
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
718 adding 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
719 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
720 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
721
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
722 diff -r ... 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
723 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
724 +++ b/2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
725 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
726 +2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
727 1: [mq]: 2.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
728 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
729 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
730 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
731 # User jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
732 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
733
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
734 diff -r ... 2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
735 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
736 +++ b/2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
737 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
738 +2
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
739 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
740 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
741 ==== qnew -U -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
742 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
743 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
744 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
745 Three
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
746
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
747 2: Three - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
748 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
749 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
750 ==== qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
751 adding 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
752 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
753 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
754 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
755 Three
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
756
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
757 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
758 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
759 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
760 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
761 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
762 2: Three - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
763 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
764 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
765 ==== qref -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
766 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
767 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
768 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
769 Drei
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
770
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
771 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
772 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
773 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
774 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
775 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
776 2: Drei - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
777 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
778 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
779 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
780 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
781 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
782 # User mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
783 Drei
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
784
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
785 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
786 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
787 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
788 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
789 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
790 2: Drei - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
791 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
792 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
793 ==== qref -u -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
794 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
795 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
796 # User maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
797 Three (again)
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
798
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
799 diff -r ... 3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
800 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
801 +++ b/3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
802 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
803 +3
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
804 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
805 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
806 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
807 ==== qnew -m
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
808 adding 4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
809 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
810 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
811 Four
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
812
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
813 diff -r ... 4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
814 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
815 +++ b/4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
816 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
817 +4 t
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
818 3: Four - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
819 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
820 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
821 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
822 ==== qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
823 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
824 # User jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
825 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
826 Four
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
827
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
828 diff -r ... 4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
829 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
830 +++ b/4of
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
831 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
832 +4 t
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
833 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
834 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
835 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
836 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
837 ==== qnew with HG header
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
838 popping 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
839 now at: 4.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
840 now at: 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
841 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
842 # User johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
843 4: imported patch 5.patch - johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
844 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
845 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
846 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
847 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
848 ==== hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
849 adding 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
850 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
851 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
852 # User johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
853
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
854 diff -r ... 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
855 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
856 +++ b/5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
857 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
858 +5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
859 4: [mq]: 5.patch - johndoe
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
860 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
861 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
862 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
863 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
864 ==== hg qref -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
865 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
866 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
867 # User test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
868
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
869 diff -r ... 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
870 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
871 +++ b/5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
872 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
873 +5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
874 4: [mq]: 5.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
875 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
876 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
877 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
878 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
879 ==== hg qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
880 # HG changeset patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
881 # Parent
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
882 # User johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
883
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
884 diff -r ... 5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
885 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
886 +++ b/5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
887 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
888 +5
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
889 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
890 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
891 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
892 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
893 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
894 ==== qnew with plain header
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
895 popping 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
896 now at: 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
897 now at: 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
898 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
899
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
900 5: imported patch 6.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
901 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
902 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
903 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
904 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
905 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
906 ==== hg qref
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
907 adding 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
908 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
909
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
910 diff -r ... 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
911 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
912 +++ b/6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
913 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
914 +6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
915 5: [mq]: 6.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
916 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
917 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
918 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
919 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
920 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
921 ==== hg qref -U
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
922 From: test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
923
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
924 diff -r ... 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
925 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
926 +++ b/6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
927 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
928 +6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
929 5: [mq]: 6.patch - test
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
930 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
931 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
932 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
933 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
934 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
935 ==== hg qref -u
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
936 From: johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
937
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
938 diff -r ... 6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
939 --- /dev/null
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
940 +++ b/6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
941 @@ -0,0 +1,1 @@
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
942 +6
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
943 5: [mq]: 6.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
944 4: [mq]: 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
945 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
946 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
947 1: [mq]: 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
948 0: [mq]: 1.patch - mary
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
949 ==== qpop -a / qpush -a
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
950 popping 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
951 popping 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
952 popping 4.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
953 popping 3.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
954 popping 2.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
955 popping 1.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
956 patch queue now empty
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
957 applying 1.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
958 applying 2.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
959 applying 3.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
960 applying 4.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
961 applying 5.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
962 applying 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
963 now at: 6.patch
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
964 5: imported patch 6.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
965 4: imported patch 5.patch - johndeere
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
966 3: Four - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
967 2: Three (again) - maria
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
968 1: imported patch 2.patch - jane
da2cfdc33fe8 tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents: 10413
diff changeset
969 0: imported patch 1.patch - mary
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12462
diff changeset
970
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12462
diff changeset
971 $ cd ..