|
1 ==== init |
|
2 ==== qnew -U |
|
3 From: test |
|
4 |
|
5 0: [mq]: 1.patch - test |
|
6 ==== qref |
|
7 adding 1 |
|
8 From: test |
|
9 |
|
10 diff -r ... 1 |
|
11 --- /dev/null |
|
12 +++ b/1 |
|
13 @@ -0,0 +1,1 @@ |
|
14 +1 |
|
15 0: [mq]: 1.patch - test |
|
16 ==== qref -u |
|
17 From: mary |
|
18 |
|
19 diff -r ... 1 |
|
20 --- /dev/null |
|
21 +++ b/1 |
|
22 @@ -0,0 +1,1 @@ |
|
23 +1 |
|
24 0: [mq]: 1.patch - mary |
|
25 ==== qnew |
|
26 adding 2 |
|
27 diff -r ... 2 |
|
28 --- /dev/null |
|
29 +++ b/2 |
|
30 @@ -0,0 +1,1 @@ |
|
31 +2 |
|
32 1: [mq]: 2.patch - test |
|
33 0: [mq]: 1.patch - mary |
|
34 ==== qref -u |
|
35 From: jane |
|
36 |
|
37 |
|
38 diff -r ... 2 |
|
39 --- /dev/null |
|
40 +++ b/2 |
|
41 @@ -0,0 +1,1 @@ |
|
42 +2 |
|
43 1: [mq]: 2.patch - jane |
|
44 0: [mq]: 1.patch - mary |
|
45 ==== qnew -U -m |
|
46 From: test |
|
47 |
|
48 Three |
|
49 2: Three - test |
|
50 1: [mq]: 2.patch - jane |
|
51 0: [mq]: 1.patch - mary |
|
52 ==== qref |
|
53 adding 3 |
|
54 From: test |
|
55 |
|
56 Three |
|
57 |
|
58 diff -r ... 3 |
|
59 --- /dev/null |
|
60 +++ b/3 |
|
61 @@ -0,0 +1,1 @@ |
|
62 +3 |
|
63 2: Three - test |
|
64 1: [mq]: 2.patch - jane |
|
65 0: [mq]: 1.patch - mary |
|
66 ==== qref -m |
|
67 From: test |
|
68 |
|
69 Drei |
|
70 |
|
71 diff -r ... 3 |
|
72 --- /dev/null |
|
73 +++ b/3 |
|
74 @@ -0,0 +1,1 @@ |
|
75 +3 |
|
76 2: Drei - test |
|
77 1: [mq]: 2.patch - jane |
|
78 0: [mq]: 1.patch - mary |
|
79 ==== qref -u |
|
80 From: mary |
|
81 |
|
82 Drei |
|
83 |
|
84 diff -r ... 3 |
|
85 --- /dev/null |
|
86 +++ b/3 |
|
87 @@ -0,0 +1,1 @@ |
|
88 +3 |
|
89 2: Drei - mary |
|
90 1: [mq]: 2.patch - jane |
|
91 0: [mq]: 1.patch - mary |
|
92 ==== qref -u -m |
|
93 From: maria |
|
94 |
|
95 Three (again) |
|
96 |
|
97 diff -r ... 3 |
|
98 --- /dev/null |
|
99 +++ b/3 |
|
100 @@ -0,0 +1,1 @@ |
|
101 +3 |
|
102 2: Three (again) - maria |
|
103 1: [mq]: 2.patch - jane |
|
104 0: [mq]: 1.patch - mary |
|
105 ==== qnew -m |
|
106 adding 4 |
|
107 Four |
|
108 |
|
109 diff -r ... 4 |
|
110 --- /dev/null |
|
111 +++ b/4 |
|
112 @@ -0,0 +1,1 @@ |
|
113 +4 |
|
114 3: Four - test |
|
115 2: Three (again) - maria |
|
116 1: [mq]: 2.patch - jane |
|
117 0: [mq]: 1.patch - mary |
|
118 ==== qref -u |
|
119 From: jane |
|
120 |
|
121 Four |
|
122 |
|
123 diff -r ... 4 |
|
124 --- /dev/null |
|
125 +++ b/4 |
|
126 @@ -0,0 +1,1 @@ |
|
127 +4 |
|
128 3: Four - jane |
|
129 2: Three (again) - maria |
|
130 1: [mq]: 2.patch - jane |
|
131 0: [mq]: 1.patch - mary |
|
132 ==== qnew with HG header |
|
133 Now at: 4.patch |
|
134 applying 5.patch |
|
135 patch failed, unable to continue (try -v) |
|
136 patch 5.patch is empty |
|
137 Now at: 5.patch |
|
138 # HG changeset patch |
|
139 # User johndoe |
|
140 4: imported patch 5.patch - johndoe |
|
141 3: Four - jane |
|
142 2: Three (again) - maria |
|
143 1: [mq]: 2.patch - jane |
|
144 0: [mq]: 1.patch - mary |
|
145 ==== hg qref |
|
146 adding 5 |
|
147 # HG changeset patch |
|
148 # User johndoe |
|
149 |
|
150 diff -r ... 5 |
|
151 --- /dev/null |
|
152 +++ b/5 |
|
153 @@ -0,0 +1,1 @@ |
|
154 +5 |
|
155 4: [mq]: 5.patch - johndoe |
|
156 3: Four - jane |
|
157 2: Three (again) - maria |
|
158 1: [mq]: 2.patch - jane |
|
159 0: [mq]: 1.patch - mary |
|
160 ==== hg qref -U |
|
161 # HG changeset patch |
|
162 # User test |
|
163 |
|
164 diff -r ... 5 |
|
165 --- /dev/null |
|
166 +++ b/5 |
|
167 @@ -0,0 +1,1 @@ |
|
168 +5 |
|
169 4: [mq]: 5.patch - test |
|
170 3: Four - jane |
|
171 2: Three (again) - maria |
|
172 1: [mq]: 2.patch - jane |
|
173 0: [mq]: 1.patch - mary |
|
174 ==== hg qref -u |
|
175 # HG changeset patch |
|
176 # User johndeere |
|
177 |
|
178 diff -r ... 5 |
|
179 --- /dev/null |
|
180 +++ b/5 |
|
181 @@ -0,0 +1,1 @@ |
|
182 +5 |
|
183 4: [mq]: 5.patch - johndeere |
|
184 3: Four - jane |
|
185 2: Three (again) - maria |
|
186 1: [mq]: 2.patch - jane |
|
187 0: [mq]: 1.patch - mary |
|
188 ==== qpop -a / qpush -a |
|
189 Patch queue now empty |
|
190 applying 1.patch |
|
191 applying 2.patch |
|
192 applying 3.patch |
|
193 applying 4.patch |
|
194 applying 5.patch |
|
195 Now at: 5.patch |
|
196 4: imported patch 5.patch - johndeere |
|
197 3: Four - jane |
|
198 2: Three (again) - maria |
|
199 1: imported patch 2.patch - jane |
|
200 0: imported patch 1.patch - mary |