| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
| Mon, 20 Jan 2020 17:44:03 -0500 | |
| changeset 44114 | 8a3b045d9086 |
| parent 35385 | 469b06b4c3ca |
| permissions | -rw-r--r-- |
|
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/" |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
9 |
> hg log --template "{rev}: {node|short} {desc} - {author}\n"
|
|
12462
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 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
125 |
> hg log --template "{rev}: {node|short} {desc} - {author}\n"
|
|
12462
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 |
|
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
138 |
0: a054644889e5 [mq]: 1.patch - test |
|
12462
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 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
148 |
0: 2905f1e46ee0 [mq]: 1.patch - test |
|
12462
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 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
157 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
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 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
165 |
1: 527f98a12a7a [mq]: 2.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
166 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
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 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
175 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
176 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
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 |
|
23344
6333412245ec
mq: when setting message in plain mode, separate it from header (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents:
22546
diff
changeset
|
179 |
|
|
12462
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 |
|
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
182 |
2: 0ffa16a9088e Three - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
183 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
184 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
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 |
|
23344
6333412245ec
mq: when setting message in plain mode, separate it from header (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents:
22546
diff
changeset
|
188 |
|
|
12462
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 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
196 |
2: 83f1290c6086 Three - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
197 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
198 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
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 |
|
23344
6333412245ec
mq: when setting message in plain mode, separate it from header (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents:
22546
diff
changeset
|
201 |
|
|
12462
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 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
209 |
2: b0d856328d4d Drei - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
210 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
211 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
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 |
|
23344
6333412245ec
mq: when setting message in plain mode, separate it from header (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents:
22546
diff
changeset
|
214 |
|
|
12462
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 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
222 |
2: bb9d4b28e6a6 Drei - mary |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
223 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
224 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
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 |
|
23344
6333412245ec
mq: when setting message in plain mode, separate it from header (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents:
22546
diff
changeset
|
227 |
|
|
12462
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 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
235 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
236 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
237 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
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 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
247 |
3: b9f922d0da40 Four - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
248 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
249 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
250 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
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 |
|
23346
5ccced6eab0b
mq: when adding headers in plain mode, separate them from message (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents:
23344
diff
changeset
|
253 |
|
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
254 |
Four |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
255 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
256 |
diff -r ... 4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
257 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
258 |
+++ b/4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
259 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
260 |
+4 t |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
261 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
262 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
263 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
264 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
265 |
==== qnew with HG header |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
266 |
popping 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
267 |
now at: 4.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
268 |
now at: 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
269 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
270 |
# User johndoe |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
271 |
4: 72bc4a0467ef imported patch 5.patch - johndoe |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
272 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
273 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
274 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
275 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
276 |
==== hg qref |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
277 |
adding 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
278 |
# HG changeset patch |
|
22546
aac5482db318
mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22520
diff
changeset
|
279 |
# User johndoe |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
280 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
281 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
282 |
diff -r ... 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
283 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
284 |
+++ b/5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
285 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
286 |
+5 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
287 |
4: ff5c06112e5a [mq]: 5.patch - johndoe |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
288 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
289 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
290 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
291 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
292 |
==== hg qref -U |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
293 |
# HG changeset patch |
|
22546
aac5482db318
mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22520
diff
changeset
|
294 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
295 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
296 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
297 |
diff -r ... 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
298 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
299 |
+++ b/5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
300 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
301 |
+5 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
302 |
4: c947416c22b1 [mq]: 5.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
303 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
304 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
305 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
306 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
307 |
==== hg qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
308 |
# HG changeset patch |
|
22546
aac5482db318
mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22520
diff
changeset
|
309 |
# User johndeere |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
310 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
311 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
312 |
diff -r ... 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
313 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
314 |
+++ b/5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
315 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
316 |
+5 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
317 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
318 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
319 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
320 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
321 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
322 |
==== qnew with plain header |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
323 |
popping 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
324 |
now at: 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
325 |
now at: 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
326 |
From: test |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
327 |
|
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
328 |
5: 7825a18ec839 imported patch 6.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
329 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
330 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
331 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
332 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
333 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
334 |
==== hg qref |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
335 |
adding 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
336 |
From: test |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
337 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
338 |
diff -r ... 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
339 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
340 |
+++ b/6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
341 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
342 |
+6 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
343 |
5: 09d19592680d [mq]: 6.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
344 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
345 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
346 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
347 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
348 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
349 |
==== hg qref -U |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
350 |
From: test |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
351 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
352 |
diff -r ... 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
353 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
354 |
+++ b/6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
355 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
356 |
+6 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
357 |
5: 09d19592680d [mq]: 6.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
358 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
359 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
360 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
361 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
362 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
363 |
==== hg qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
364 |
From: johndeere |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
365 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
366 |
diff -r ... 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
367 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
368 |
+++ b/6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
369 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
370 |
+6 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
371 |
5: 32641ee07196 [mq]: 6.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
372 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
373 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
374 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
375 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
376 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
377 |
==== qpop -a / qpush -a |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
378 |
popping 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
379 |
popping 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
380 |
popping 4.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
381 |
popping 3.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
382 |
popping 2.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
383 |
popping 1.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
384 |
patch queue now empty |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
385 |
applying 1.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
386 |
applying 2.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
387 |
applying 3.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
388 |
applying 4.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
389 |
applying 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
390 |
applying 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
391 |
now at: 6.patch |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
392 |
5: 1fb083c80457 imported patch 6.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
393 |
4: 7e96e969691d imported patch 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
394 |
3: c7147533d3cd Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
395 |
2: b383d04401ea Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
396 |
1: fac2da4efc3c imported patch 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
397 |
0: b6e237e8771b imported patch 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
398 |
$ 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
|
399 |
|
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
400 |
======= hg headers |
|
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
7627
diff
changeset
|
401 |
|
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
402 |
$ echo "plain=false" >> $HGRCPATH |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
403 |
$ mkdir sandbox |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
404 |
$ (cd sandbox ; runtest) |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
405 |
==== init |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
406 |
==== qnew -U |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
407 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
408 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
409 |
# Parent |
|
22519
c87f2a5a6e49
mq: correctly make an empty line after description in new patches
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
410 |
|
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
411 |
0: a054644889e5 [mq]: 1.patch - test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
412 |
==== qref |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
413 |
adding 1 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
414 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
415 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
416 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
417 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
418 |
diff -r ... 1 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
419 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
420 |
+++ b/1 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
421 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
422 |
+1 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
423 |
0: 2905f1e46ee0 [mq]: 1.patch - test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
424 |
==== qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
425 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
426 |
# User mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
427 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
428 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
429 |
diff -r ... 1 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
430 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
431 |
+++ b/1 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
432 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
433 |
+1 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
434 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
435 |
==== qnew |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
436 |
adding 2 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
437 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
438 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
439 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
440 |
diff -r ... 2 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
441 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
442 |
+++ b/2 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
443 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
444 |
+2 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
445 |
1: 527f98a12a7a [mq]: 2.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
446 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
447 |
==== qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
448 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
449 |
# User jane |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
450 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
451 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
452 |
diff -r ... 2 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
453 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
454 |
+++ b/2 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
455 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
456 |
+2 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
457 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
458 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
459 |
==== qnew -U -m |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
460 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
461 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
462 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
463 |
Three |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
464 |
|
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
465 |
2: 0ffa16a9088e Three - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
466 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
467 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
468 |
==== qref |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
469 |
adding 3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
470 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
471 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
472 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
473 |
Three |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
474 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
475 |
diff -r ... 3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
476 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
477 |
+++ b/3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
478 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
479 |
+3 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
480 |
2: 83f1290c6086 Three - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
481 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
482 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
483 |
==== qref -m |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
484 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
485 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
486 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
487 |
Drei |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
488 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
489 |
diff -r ... 3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
490 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
491 |
+++ b/3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
492 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
493 |
+3 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
494 |
2: b0d856328d4d Drei - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
495 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
496 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
497 |
==== qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
498 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
499 |
# User mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
500 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
501 |
Drei |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
502 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
503 |
diff -r ... 3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
504 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
505 |
+++ b/3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
506 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
507 |
+3 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
508 |
2: bb9d4b28e6a6 Drei - mary |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
509 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
510 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
511 |
==== qref -u -m |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
512 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
513 |
# User maria |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
514 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
515 |
Three (again) |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
516 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
517 |
diff -r ... 3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
518 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
519 |
+++ b/3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
520 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
521 |
+3 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
522 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
523 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
524 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
525 |
==== qnew -m |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
526 |
adding 4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
527 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
528 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
529 |
Four |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
530 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
531 |
diff -r ... 4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
532 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
533 |
+++ b/4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
534 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
535 |
+4 t |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
536 |
3: b9f922d0da40 Four - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
537 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
538 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
539 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
540 |
==== qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
541 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
542 |
# User jane |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
543 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
544 |
Four |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
545 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
546 |
diff -r ... 4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
547 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
548 |
+++ b/4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
549 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
550 |
+4 t |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
551 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
552 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
553 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
554 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
555 |
==== qnew with HG header |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
556 |
popping 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
557 |
now at: 4.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
558 |
now at: 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
559 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
560 |
# User johndoe |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
561 |
4: 72bc4a0467ef imported patch 5.patch - johndoe |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
562 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
563 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
564 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
565 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
566 |
==== hg qref |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
567 |
adding 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
568 |
# HG changeset patch |
|
22546
aac5482db318
mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22520
diff
changeset
|
569 |
# User johndoe |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
570 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
571 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
572 |
diff -r ... 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
573 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
574 |
+++ b/5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
575 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
576 |
+5 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
577 |
4: ff5c06112e5a [mq]: 5.patch - johndoe |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
578 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
579 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
580 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
581 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
582 |
==== hg qref -U |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
583 |
# HG changeset patch |
|
22546
aac5482db318
mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22520
diff
changeset
|
584 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
585 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
586 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
587 |
diff -r ... 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
588 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
589 |
+++ b/5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
590 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
591 |
+5 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
592 |
4: c947416c22b1 [mq]: 5.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
593 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
594 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
595 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
596 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
597 |
==== hg qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
598 |
# HG changeset patch |
|
22546
aac5482db318
mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22520
diff
changeset
|
599 |
# User johndeere |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
600 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
601 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
602 |
diff -r ... 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
603 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
604 |
+++ b/5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
605 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
606 |
+5 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
607 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
608 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
609 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
610 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
611 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
612 |
==== qnew with plain header |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
613 |
popping 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
614 |
now at: 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
615 |
now at: 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
616 |
From: test |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
617 |
|
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
618 |
5: 7825a18ec839 imported patch 6.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
619 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
620 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
621 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
622 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
623 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
624 |
==== hg qref |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
625 |
adding 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
626 |
From: test |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
627 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
628 |
diff -r ... 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
629 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
630 |
+++ b/6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
631 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
632 |
+6 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
633 |
5: 09d19592680d [mq]: 6.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
634 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
635 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
636 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
637 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
638 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
639 |
==== hg qref -U |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
640 |
From: test |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
641 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
642 |
diff -r ... 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
643 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
644 |
+++ b/6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
645 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
646 |
+6 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
647 |
5: 09d19592680d [mq]: 6.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
648 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
649 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
650 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
651 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
652 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
653 |
==== hg qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
654 |
From: johndeere |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
655 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
656 |
diff -r ... 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
657 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
658 |
+++ b/6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
659 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
660 |
+6 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
661 |
5: 32641ee07196 [mq]: 6.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
662 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
663 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
664 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
665 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
666 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
667 |
==== qpop -a / qpush -a |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
668 |
popping 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
669 |
popping 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
670 |
popping 4.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
671 |
popping 3.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
672 |
popping 2.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
673 |
popping 1.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
674 |
patch queue now empty |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
675 |
applying 1.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
676 |
applying 2.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
677 |
applying 3.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
678 |
applying 4.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
679 |
applying 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
680 |
applying 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
681 |
now at: 6.patch |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
682 |
5: 1fb083c80457 imported patch 6.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
683 |
4: 7e96e969691d imported patch 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
684 |
3: c7147533d3cd Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
685 |
2: b383d04401ea Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
686 |
1: fac2da4efc3c imported patch 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
687 |
0: b6e237e8771b imported patch 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
688 |
$ rm -r sandbox |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
689 |
$ runtest |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
690 |
==== init |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
691 |
==== qnew -U |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
692 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
693 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
694 |
# Parent |
|
22519
c87f2a5a6e49
mq: correctly make an empty line after description in new patches
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
695 |
|
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
696 |
0: a054644889e5 [mq]: 1.patch - test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
697 |
==== qref |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
698 |
adding 1 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
699 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
700 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
701 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
702 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
703 |
diff -r ... 1 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
704 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
705 |
+++ b/1 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
706 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
707 |
+1 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
708 |
0: 2905f1e46ee0 [mq]: 1.patch - test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
709 |
==== qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
710 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
711 |
# User mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
712 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
713 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
714 |
diff -r ... 1 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
715 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
716 |
+++ b/1 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
717 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
718 |
+1 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
719 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
720 |
==== qnew |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
721 |
adding 2 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
722 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
723 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
724 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
725 |
diff -r ... 2 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
726 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
727 |
+++ b/2 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
728 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
729 |
+2 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
730 |
1: 527f98a12a7a [mq]: 2.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
731 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
732 |
==== qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
733 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
734 |
# User jane |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
735 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
736 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
737 |
diff -r ... 2 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
738 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
739 |
+++ b/2 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
740 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
741 |
+2 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
742 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
743 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
744 |
==== qnew -U -m |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
745 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
746 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
747 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
748 |
Three |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
749 |
|
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
750 |
2: 0ffa16a9088e Three - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
751 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
752 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
753 |
==== qref |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
754 |
adding 3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
755 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
756 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
757 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
758 |
Three |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
759 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
760 |
diff -r ... 3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
761 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
762 |
+++ b/3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
763 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
764 |
+3 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
765 |
2: 83f1290c6086 Three - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
766 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
767 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
768 |
==== qref -m |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
769 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
770 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
771 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
772 |
Drei |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
773 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
774 |
diff -r ... 3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
775 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
776 |
+++ b/3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
777 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
778 |
+3 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
779 |
2: b0d856328d4d Drei - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
780 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
781 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
782 |
==== qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
783 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
784 |
# User mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
785 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
786 |
Drei |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
787 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
788 |
diff -r ... 3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
789 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
790 |
+++ b/3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
791 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
792 |
+3 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
793 |
2: bb9d4b28e6a6 Drei - mary |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
794 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
795 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
796 |
==== qref -u -m |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
797 |
# HG changeset patch |
|
22520
9d4ebb75de53
mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22519
diff
changeset
|
798 |
# User maria |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
799 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
800 |
Three (again) |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
801 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
802 |
diff -r ... 3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
803 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
804 |
+++ b/3 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
805 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
806 |
+3 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
807 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
808 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
809 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
810 |
==== qnew -m |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
811 |
adding 4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
812 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
813 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
814 |
Four |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
815 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
816 |
diff -r ... 4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
817 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
818 |
+++ b/4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
819 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
820 |
+4 t |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
821 |
3: b9f922d0da40 Four - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
822 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
823 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
824 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
825 |
==== qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
826 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
827 |
# User jane |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
828 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
829 |
Four |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
830 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
831 |
diff -r ... 4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
832 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
833 |
+++ b/4of |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
834 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
835 |
+4 t |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
836 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
837 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
838 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
839 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
840 |
==== qnew with HG header |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
841 |
popping 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
842 |
now at: 4.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
843 |
now at: 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
844 |
# HG changeset patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
845 |
# User johndoe |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
846 |
4: 72bc4a0467ef imported patch 5.patch - johndoe |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
847 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
848 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
849 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
850 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
851 |
==== hg qref |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
852 |
adding 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
853 |
# HG changeset patch |
|
22546
aac5482db318
mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22520
diff
changeset
|
854 |
# User johndoe |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
855 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
856 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
857 |
diff -r ... 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
858 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
859 |
+++ b/5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
860 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
861 |
+5 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
862 |
4: ff5c06112e5a [mq]: 5.patch - johndoe |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
863 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
864 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
865 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
866 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
867 |
==== hg qref -U |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
868 |
# HG changeset patch |
|
22546
aac5482db318
mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22520
diff
changeset
|
869 |
# User test |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
870 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
871 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
872 |
diff -r ... 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
873 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
874 |
+++ b/5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
875 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
876 |
+5 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
877 |
4: c947416c22b1 [mq]: 5.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
878 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
879 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
880 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
881 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
882 |
==== hg qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
883 |
# HG changeset patch |
|
22546
aac5482db318
mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22520
diff
changeset
|
884 |
# User johndeere |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
885 |
# Parent |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
886 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
887 |
diff -r ... 5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
888 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
889 |
+++ b/5 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
890 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
891 |
+5 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
892 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
893 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
894 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
895 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
896 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
897 |
==== qnew with plain header |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
898 |
popping 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
899 |
now at: 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
900 |
now at: 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
901 |
From: test |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
902 |
|
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
903 |
5: 7825a18ec839 imported patch 6.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
904 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
905 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
906 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
907 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
908 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
909 |
==== hg qref |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
910 |
adding 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
911 |
From: test |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
912 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
913 |
diff -r ... 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
914 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
915 |
+++ b/6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
916 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
917 |
+6 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
918 |
5: 09d19592680d [mq]: 6.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
919 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
920 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
921 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
922 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
923 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
924 |
==== hg qref -U |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
925 |
From: test |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
926 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
927 |
diff -r ... 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
928 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
929 |
+++ b/6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
930 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
931 |
+6 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
932 |
5: 09d19592680d [mq]: 6.patch - test |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
933 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
934 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
935 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
936 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
937 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
938 |
==== hg qref -u |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
939 |
From: johndeere |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
940 |
|
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
941 |
diff -r ... 6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
942 |
--- /dev/null |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
943 |
+++ b/6 |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
944 |
@@ -0,0 +1,1 @@ |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
945 |
+6 |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
946 |
5: 32641ee07196 [mq]: 6.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
947 |
4: 1d898e201a22 [mq]: 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
948 |
3: 0dfb3111e7ee Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
949 |
2: a6686ee84fc3 Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
950 |
1: a425cde5f493 [mq]: 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
951 |
0: 3682f830e656 [mq]: 1.patch - mary |
|
12462
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
952 |
==== qpop -a / qpush -a |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
953 |
popping 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
954 |
popping 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
955 |
popping 4.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
956 |
popping 3.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
957 |
popping 2.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
958 |
popping 1.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
959 |
patch queue now empty |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
960 |
applying 1.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
961 |
applying 2.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
962 |
applying 3.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
963 |
applying 4.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
964 |
applying 5.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
965 |
applying 6.patch |
|
da2cfdc33fe8
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com>
parents:
10413
diff
changeset
|
966 |
now at: 6.patch |
|
35385
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
967 |
5: 1fb083c80457 imported patch 6.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
968 |
4: 7e96e969691d imported patch 5.patch - johndeere |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
969 |
3: c7147533d3cd Four - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
970 |
2: b383d04401ea Three (again) - maria |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
971 |
1: fac2da4efc3c imported patch 2.patch - jane |
|
469b06b4c3ca
tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents:
23346
diff
changeset
|
972 |
0: b6e237e8771b imported patch 1.patch - mary |
|
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12462
diff
changeset
|
973 |
|
|
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12462
diff
changeset
|
974 |
$ cd .. |