Show More
@@ -1,178 +1,177 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | echo "[extensions]" >> $HGRCPATH |
|
4 | 4 | echo "mq=" >> $HGRCPATH |
|
5 | 5 | echo "[diff]" >> $HGRCPATH |
|
6 | 6 | echo "nodates=true" >> $HGRCPATH |
|
7 | 7 | |
|
8 | 8 | |
|
9 | 9 | catpatch() { |
|
10 | 10 | cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" |
|
11 | 11 | } |
|
12 | 12 | |
|
13 | 13 | catlog() { |
|
14 | 14 | catpatch $1 |
|
15 | 15 | hg log --template "{rev}: {desc} - {author}\n" |
|
16 | 16 | } |
|
17 | 17 | |
|
18 | 18 | catlogd() { |
|
19 | 19 | catpatch $1 |
|
20 | 20 | hg log --template "{rev}: {desc} - {author} - {date}\n" |
|
21 | 21 | } |
|
22 | 22 | |
|
23 | 23 | drop() { |
|
24 | 24 | hg qpop |
|
25 | 25 | hg qdel $1.patch |
|
26 | 26 | } |
|
27 | 27 | |
|
28 | 28 | |
|
29 | 29 | echo ==== init |
|
30 | 30 | hg init a |
|
31 | 31 | cd a |
|
32 | 32 | hg qinit |
|
33 | 33 | |
|
34 | 34 | |
|
35 | 35 | echo ==== qnew -d |
|
36 | 36 | hg qnew -d '3 0' 1.patch |
|
37 | 37 | catlogd 1 |
|
38 | 38 | |
|
39 | 39 | echo ==== qref |
|
40 | 40 | echo "1" >1 |
|
41 | 41 | hg add |
|
42 | 42 | hg qref |
|
43 | 43 | catlogd 1 |
|
44 | 44 | |
|
45 | 45 | echo ==== qref -d |
|
46 | 46 | hg qref -d '4 0' |
|
47 | 47 | catlogd 1 |
|
48 | 48 | |
|
49 | 49 | |
|
50 | 50 | echo ==== qnew |
|
51 | 51 | hg qnew 2.patch |
|
52 | 52 | echo "2" >2 |
|
53 | 53 | hg add |
|
54 | 54 | hg qref |
|
55 | 55 | catlog 2 |
|
56 | 56 | |
|
57 | 57 | echo ==== qref -d |
|
58 | 58 | hg qref -d '5 0' |
|
59 | 59 | catlog 2 |
|
60 | 60 | |
|
61 | 61 | drop 2 |
|
62 | 62 | |
|
63 | 63 | |
|
64 | 64 | echo ==== qnew -d -m |
|
65 | 65 | hg qnew -d '6 0' -m "Three" 3.patch |
|
66 | 66 | catlogd 3 |
|
67 | 67 | |
|
68 | 68 | echo ==== qref |
|
69 | 69 | echo "3" >3 |
|
70 | 70 | hg add |
|
71 | 71 | hg qref |
|
72 | 72 | catlogd 3 |
|
73 | 73 | |
|
74 | 74 | echo ==== qref -m |
|
75 | 75 | hg qref -m "Drei" |
|
76 | 76 | catlogd 3 |
|
77 | 77 | |
|
78 | 78 | echo ==== qref -d |
|
79 | 79 | hg qref -d '7 0' |
|
80 | 80 | catlogd 3 |
|
81 | 81 | |
|
82 | 82 | echo ==== qref -d -m |
|
83 | 83 | hg qref -d '8 0' -m "Three (again)" |
|
84 | 84 | catlogd 3 |
|
85 | 85 | |
|
86 | 86 | |
|
87 | 87 | echo ==== qnew -m |
|
88 | 88 | hg qnew -m "Four" 4.patch |
|
89 | 89 | echo "4" >4 |
|
90 | 90 | hg add |
|
91 | 91 | hg qref |
|
92 | 92 | catlog 4 |
|
93 | 93 | |
|
94 | 94 | echo ==== qref -d |
|
95 | 95 | hg qref -d '9 0' |
|
96 | 96 | catlog 4 |
|
97 | 97 | |
|
98 | 98 | drop 4 |
|
99 | 99 | |
|
100 | 100 | |
|
101 | 101 | echo ==== qnew with HG header |
|
102 | 102 | hg qnew 5.patch |
|
103 | 103 | hg qpop |
|
104 | 104 | echo "# HG changeset patch" >>.hg/patches/5.patch |
|
105 | 105 | echo "# Date 10 0" >>.hg/patches/5.patch |
|
106 | # Drop patch specific error line | |
|
107 | hg qpush 2>&1 | grep -v garbage | |
|
106 | hg qpush 2>&1 | grep 'Now at' | |
|
108 | 107 | catlogd 5 |
|
109 | 108 | |
|
110 | 109 | echo ==== hg qref |
|
111 | 110 | echo "5" >5 |
|
112 | 111 | hg add |
|
113 | 112 | hg qref |
|
114 | 113 | catlogd 5 |
|
115 | 114 | |
|
116 | 115 | echo ==== hg qref -d |
|
117 | 116 | hg qref -d '11 0' |
|
118 | 117 | catlogd 5 |
|
119 | 118 | |
|
120 | 119 | |
|
121 | 120 | echo ==== qnew -u |
|
122 | 121 | hg qnew -u jane 6.patch |
|
123 | 122 | echo "6" >6 |
|
124 | 123 | hg add |
|
125 | 124 | hg qref |
|
126 | 125 | catlog 6 |
|
127 | 126 | |
|
128 | 127 | echo ==== qref -d |
|
129 | 128 | hg qref -d '12 0' |
|
130 | 129 | catlog 6 |
|
131 | 130 | |
|
132 | 131 | drop 6 |
|
133 | 132 | |
|
134 | 133 | |
|
135 | 134 | echo ==== qnew -d |
|
136 | 135 | hg qnew -d '13 0' 7.patch |
|
137 | 136 | echo "7" >7 |
|
138 | 137 | hg add |
|
139 | 138 | hg qref |
|
140 | 139 | catlog 7 |
|
141 | 140 | |
|
142 | 141 | echo ==== qref -u |
|
143 | 142 | hg qref -u john |
|
144 | 143 | catlogd 7 |
|
145 | 144 | |
|
146 | 145 | |
|
147 | 146 | echo ==== qnew |
|
148 | 147 | hg qnew 8.patch |
|
149 | 148 | echo "8" >8 |
|
150 | 149 | hg add |
|
151 | 150 | hg qref |
|
152 | 151 | catlog 8 |
|
153 | 152 | |
|
154 | 153 | echo ==== qref -u -d |
|
155 | 154 | hg qref -u john -d '14 0' |
|
156 | 155 | catlog 8 |
|
157 | 156 | |
|
158 | 157 | drop 8 |
|
159 | 158 | |
|
160 | 159 | |
|
161 | 160 | echo ==== qnew -m |
|
162 | 161 | hg qnew -m "Nine" 9.patch |
|
163 | 162 | echo "9" >9 |
|
164 | 163 | hg add |
|
165 | 164 | hg qref |
|
166 | 165 | catlog 9 |
|
167 | 166 | |
|
168 | 167 | echo ==== qref -u -d |
|
169 | 168 | hg qref -u john -d '15 0' |
|
170 | 169 | catlog 9 |
|
171 | 170 | |
|
172 | 171 | drop 9 |
|
173 | 172 | |
|
174 | 173 | |
|
175 | 174 | echo ==== "qpop -a / qpush -a" |
|
176 | 175 | hg qpop -a |
|
177 | 176 | hg qpush -a |
|
178 | 177 | hg log --template "{rev}: {desc} - {author} - {date}\n" |
@@ -1,287 +1,284 b'' | |||
|
1 | 1 | ==== init |
|
2 | 2 | ==== qnew -d |
|
3 | 3 | # HG changeset patch |
|
4 | 4 | # Date 3 0 |
|
5 | 5 | |
|
6 | 6 | 0: [mq]: 1.patch - test - 3.00 |
|
7 | 7 | ==== qref |
|
8 | 8 | adding 1 |
|
9 | 9 | # HG changeset patch |
|
10 | 10 | # Date 3 0 |
|
11 | 11 | |
|
12 | 12 | diff -r ... 1 |
|
13 | 13 | --- /dev/null |
|
14 | 14 | +++ b/1 |
|
15 | 15 | @@ -0,0 +1,1 @@ |
|
16 | 16 | +1 |
|
17 | 17 | 0: [mq]: 1.patch - test - 3.00 |
|
18 | 18 | ==== qref -d |
|
19 | 19 | # HG changeset patch |
|
20 | 20 | # Date 4 0 |
|
21 | 21 | |
|
22 | 22 | diff -r ... 1 |
|
23 | 23 | --- /dev/null |
|
24 | 24 | +++ b/1 |
|
25 | 25 | @@ -0,0 +1,1 @@ |
|
26 | 26 | +1 |
|
27 | 27 | 0: [mq]: 1.patch - test - 4.00 |
|
28 | 28 | ==== qnew |
|
29 | 29 | adding 2 |
|
30 | 30 | diff -r ... 2 |
|
31 | 31 | --- /dev/null |
|
32 | 32 | +++ b/2 |
|
33 | 33 | @@ -0,0 +1,1 @@ |
|
34 | 34 | +2 |
|
35 | 35 | 1: [mq]: 2.patch - test |
|
36 | 36 | 0: [mq]: 1.patch - test |
|
37 | 37 | ==== qref -d |
|
38 | 38 | diff -r ... 2 |
|
39 | 39 | --- /dev/null |
|
40 | 40 | +++ b/2 |
|
41 | 41 | @@ -0,0 +1,1 @@ |
|
42 | 42 | +2 |
|
43 | 43 | 1: [mq]: 2.patch - test |
|
44 | 44 | 0: [mq]: 1.patch - test |
|
45 | 45 | Now at: 1.patch |
|
46 | 46 | ==== qnew -d -m |
|
47 | 47 | # HG changeset patch |
|
48 | 48 | # Date 6 0 |
|
49 | 49 | |
|
50 | 50 | Three |
|
51 | 51 | 1: Three - test - 6.00 |
|
52 | 52 | 0: [mq]: 1.patch - test - 4.00 |
|
53 | 53 | ==== qref |
|
54 | 54 | adding 3 |
|
55 | 55 | # HG changeset patch |
|
56 | 56 | # Date 6 0 |
|
57 | 57 | |
|
58 | 58 | Three |
|
59 | 59 | |
|
60 | 60 | diff -r ... 3 |
|
61 | 61 | --- /dev/null |
|
62 | 62 | +++ b/3 |
|
63 | 63 | @@ -0,0 +1,1 @@ |
|
64 | 64 | +3 |
|
65 | 65 | 1: Three - test - 6.00 |
|
66 | 66 | 0: [mq]: 1.patch - test - 4.00 |
|
67 | 67 | ==== qref -m |
|
68 | 68 | # HG changeset patch |
|
69 | 69 | # Date 6 0 |
|
70 | 70 | |
|
71 | 71 | Drei |
|
72 | 72 | |
|
73 | 73 | diff -r ... 3 |
|
74 | 74 | --- /dev/null |
|
75 | 75 | +++ b/3 |
|
76 | 76 | @@ -0,0 +1,1 @@ |
|
77 | 77 | +3 |
|
78 | 78 | 1: Drei - test - 6.00 |
|
79 | 79 | 0: [mq]: 1.patch - test - 4.00 |
|
80 | 80 | ==== qref -d |
|
81 | 81 | # HG changeset patch |
|
82 | 82 | # Date 7 0 |
|
83 | 83 | |
|
84 | 84 | Drei |
|
85 | 85 | |
|
86 | 86 | diff -r ... 3 |
|
87 | 87 | --- /dev/null |
|
88 | 88 | +++ b/3 |
|
89 | 89 | @@ -0,0 +1,1 @@ |
|
90 | 90 | +3 |
|
91 | 91 | 1: Drei - test - 7.00 |
|
92 | 92 | 0: [mq]: 1.patch - test - 4.00 |
|
93 | 93 | ==== qref -d -m |
|
94 | 94 | # HG changeset patch |
|
95 | 95 | # Date 8 0 |
|
96 | 96 | |
|
97 | 97 | Three (again) |
|
98 | 98 | |
|
99 | 99 | diff -r ... 3 |
|
100 | 100 | --- /dev/null |
|
101 | 101 | +++ b/3 |
|
102 | 102 | @@ -0,0 +1,1 @@ |
|
103 | 103 | +3 |
|
104 | 104 | 1: Three (again) - test - 8.00 |
|
105 | 105 | 0: [mq]: 1.patch - test - 4.00 |
|
106 | 106 | ==== qnew -m |
|
107 | 107 | adding 4 |
|
108 | 108 | Four |
|
109 | 109 | |
|
110 | 110 | diff -r ... 4 |
|
111 | 111 | --- /dev/null |
|
112 | 112 | +++ b/4 |
|
113 | 113 | @@ -0,0 +1,1 @@ |
|
114 | 114 | +4 |
|
115 | 115 | 2: Four - test |
|
116 | 116 | 1: Three (again) - test |
|
117 | 117 | 0: [mq]: 1.patch - test |
|
118 | 118 | ==== qref -d |
|
119 | 119 | Four |
|
120 | 120 | |
|
121 | 121 | diff -r ... 4 |
|
122 | 122 | --- /dev/null |
|
123 | 123 | +++ b/4 |
|
124 | 124 | @@ -0,0 +1,1 @@ |
|
125 | 125 | +4 |
|
126 | 126 | 2: Four - test |
|
127 | 127 | 1: Three (again) - test |
|
128 | 128 | 0: [mq]: 1.patch - test |
|
129 | 129 | Now at: 3.patch |
|
130 | 130 | ==== qnew with HG header |
|
131 | 131 | Now at: 3.patch |
|
132 | applying 5.patch | |
|
133 | patch failed, unable to continue (try -v) | |
|
134 | patch 5.patch is empty | |
|
135 | 132 | Now at: 5.patch |
|
136 | 133 | # HG changeset patch |
|
137 | 134 | # Date 10 0 |
|
138 | 135 | 2: imported patch 5.patch - test - 10.00 |
|
139 | 136 | 1: Three (again) - test - 8.00 |
|
140 | 137 | 0: [mq]: 1.patch - test - 4.00 |
|
141 | 138 | ==== hg qref |
|
142 | 139 | adding 5 |
|
143 | 140 | # HG changeset patch |
|
144 | 141 | # Date 10 0 |
|
145 | 142 | |
|
146 | 143 | diff -r ... 5 |
|
147 | 144 | --- /dev/null |
|
148 | 145 | +++ b/5 |
|
149 | 146 | @@ -0,0 +1,1 @@ |
|
150 | 147 | +5 |
|
151 | 148 | 2: [mq]: 5.patch - test - 10.00 |
|
152 | 149 | 1: Three (again) - test - 8.00 |
|
153 | 150 | 0: [mq]: 1.patch - test - 4.00 |
|
154 | 151 | ==== hg qref -d |
|
155 | 152 | # HG changeset patch |
|
156 | 153 | # Date 11 0 |
|
157 | 154 | |
|
158 | 155 | diff -r ... 5 |
|
159 | 156 | --- /dev/null |
|
160 | 157 | +++ b/5 |
|
161 | 158 | @@ -0,0 +1,1 @@ |
|
162 | 159 | +5 |
|
163 | 160 | 2: [mq]: 5.patch - test - 11.00 |
|
164 | 161 | 1: Three (again) - test - 8.00 |
|
165 | 162 | 0: [mq]: 1.patch - test - 4.00 |
|
166 | 163 | ==== qnew -u |
|
167 | 164 | adding 6 |
|
168 | 165 | From: jane |
|
169 | 166 | |
|
170 | 167 | diff -r ... 6 |
|
171 | 168 | --- /dev/null |
|
172 | 169 | +++ b/6 |
|
173 | 170 | @@ -0,0 +1,1 @@ |
|
174 | 171 | +6 |
|
175 | 172 | 3: [mq]: 6.patch - jane |
|
176 | 173 | 2: [mq]: 5.patch - test |
|
177 | 174 | 1: Three (again) - test |
|
178 | 175 | 0: [mq]: 1.patch - test |
|
179 | 176 | ==== qref -d |
|
180 | 177 | From: jane |
|
181 | 178 | |
|
182 | 179 | diff -r ... 6 |
|
183 | 180 | --- /dev/null |
|
184 | 181 | +++ b/6 |
|
185 | 182 | @@ -0,0 +1,1 @@ |
|
186 | 183 | +6 |
|
187 | 184 | 3: [mq]: 6.patch - jane |
|
188 | 185 | 2: [mq]: 5.patch - test |
|
189 | 186 | 1: Three (again) - test |
|
190 | 187 | 0: [mq]: 1.patch - test |
|
191 | 188 | Now at: 5.patch |
|
192 | 189 | ==== qnew -d |
|
193 | 190 | adding 7 |
|
194 | 191 | # HG changeset patch |
|
195 | 192 | # Date 13 0 |
|
196 | 193 | |
|
197 | 194 | diff -r ... 7 |
|
198 | 195 | --- /dev/null |
|
199 | 196 | +++ b/7 |
|
200 | 197 | @@ -0,0 +1,1 @@ |
|
201 | 198 | +7 |
|
202 | 199 | 3: [mq]: 7.patch - test |
|
203 | 200 | 2: [mq]: 5.patch - test |
|
204 | 201 | 1: Three (again) - test |
|
205 | 202 | 0: [mq]: 1.patch - test |
|
206 | 203 | ==== qref -u |
|
207 | 204 | # HG changeset patch |
|
208 | 205 | # User john |
|
209 | 206 | # Date 13 0 |
|
210 | 207 | |
|
211 | 208 | diff -r ... 7 |
|
212 | 209 | --- /dev/null |
|
213 | 210 | +++ b/7 |
|
214 | 211 | @@ -0,0 +1,1 @@ |
|
215 | 212 | +7 |
|
216 | 213 | 3: [mq]: 7.patch - john - 13.00 |
|
217 | 214 | 2: [mq]: 5.patch - test - 11.00 |
|
218 | 215 | 1: Three (again) - test - 8.00 |
|
219 | 216 | 0: [mq]: 1.patch - test - 4.00 |
|
220 | 217 | ==== qnew |
|
221 | 218 | adding 8 |
|
222 | 219 | diff -r ... 8 |
|
223 | 220 | --- /dev/null |
|
224 | 221 | +++ b/8 |
|
225 | 222 | @@ -0,0 +1,1 @@ |
|
226 | 223 | +8 |
|
227 | 224 | 4: [mq]: 8.patch - test |
|
228 | 225 | 3: [mq]: 7.patch - john |
|
229 | 226 | 2: [mq]: 5.patch - test |
|
230 | 227 | 1: Three (again) - test |
|
231 | 228 | 0: [mq]: 1.patch - test |
|
232 | 229 | ==== qref -u -d |
|
233 | 230 | From: john |
|
234 | 231 | |
|
235 | 232 | |
|
236 | 233 | diff -r ... 8 |
|
237 | 234 | --- /dev/null |
|
238 | 235 | +++ b/8 |
|
239 | 236 | @@ -0,0 +1,1 @@ |
|
240 | 237 | +8 |
|
241 | 238 | 4: [mq]: 8.patch - john |
|
242 | 239 | 3: [mq]: 7.patch - john |
|
243 | 240 | 2: [mq]: 5.patch - test |
|
244 | 241 | 1: Three (again) - test |
|
245 | 242 | 0: [mq]: 1.patch - test |
|
246 | 243 | Now at: 7.patch |
|
247 | 244 | ==== qnew -m |
|
248 | 245 | adding 9 |
|
249 | 246 | Nine |
|
250 | 247 | |
|
251 | 248 | diff -r ... 9 |
|
252 | 249 | --- /dev/null |
|
253 | 250 | +++ b/9 |
|
254 | 251 | @@ -0,0 +1,1 @@ |
|
255 | 252 | +9 |
|
256 | 253 | 4: Nine - test |
|
257 | 254 | 3: [mq]: 7.patch - john |
|
258 | 255 | 2: [mq]: 5.patch - test |
|
259 | 256 | 1: Three (again) - test |
|
260 | 257 | 0: [mq]: 1.patch - test |
|
261 | 258 | ==== qref -u -d |
|
262 | 259 | From: john |
|
263 | 260 | |
|
264 | 261 | Nine |
|
265 | 262 | |
|
266 | 263 | diff -r ... 9 |
|
267 | 264 | --- /dev/null |
|
268 | 265 | +++ b/9 |
|
269 | 266 | @@ -0,0 +1,1 @@ |
|
270 | 267 | +9 |
|
271 | 268 | 4: Nine - john |
|
272 | 269 | 3: [mq]: 7.patch - john |
|
273 | 270 | 2: [mq]: 5.patch - test |
|
274 | 271 | 1: Three (again) - test |
|
275 | 272 | 0: [mq]: 1.patch - test |
|
276 | 273 | Now at: 7.patch |
|
277 | 274 | ==== qpop -a / qpush -a |
|
278 | 275 | Patch queue now empty |
|
279 | 276 | applying 1.patch |
|
280 | 277 | applying 3.patch |
|
281 | 278 | applying 5.patch |
|
282 | 279 | applying 7.patch |
|
283 | 280 | Now at: 7.patch |
|
284 | 281 | 3: imported patch 7.patch - john - 13.00 |
|
285 | 282 | 2: imported patch 5.patch - test - 11.00 |
|
286 | 283 | 1: Three (again) - test - 8.00 |
|
287 | 284 | 0: imported patch 1.patch - test - 4.00 |
@@ -1,108 +1,107 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | echo "[extensions]" >> $HGRCPATH |
|
4 | 4 | echo "mq=" >> $HGRCPATH |
|
5 | 5 | echo "[diff]" >> $HGRCPATH |
|
6 | 6 | echo "nodates=true" >> $HGRCPATH |
|
7 | 7 | |
|
8 | 8 | |
|
9 | 9 | catlog() { |
|
10 | 10 | cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" |
|
11 | 11 | hg log --template "{rev}: {desc} - {author}\n" |
|
12 | 12 | } |
|
13 | 13 | |
|
14 | 14 | |
|
15 | 15 | echo ==== init |
|
16 | 16 | hg init a |
|
17 | 17 | cd a |
|
18 | 18 | hg qinit |
|
19 | 19 | |
|
20 | 20 | |
|
21 | 21 | echo ==== qnew -U |
|
22 | 22 | hg qnew -U 1.patch |
|
23 | 23 | catlog 1 |
|
24 | 24 | |
|
25 | 25 | echo ==== qref |
|
26 | 26 | echo "1" >1 |
|
27 | 27 | hg add |
|
28 | 28 | hg qref |
|
29 | 29 | catlog 1 |
|
30 | 30 | |
|
31 | 31 | echo ==== qref -u |
|
32 | 32 | hg qref -u mary |
|
33 | 33 | catlog 1 |
|
34 | 34 | |
|
35 | 35 | echo ==== qnew |
|
36 | 36 | hg qnew 2.patch |
|
37 | 37 | echo "2" >2 |
|
38 | 38 | hg add |
|
39 | 39 | hg qref |
|
40 | 40 | catlog 2 |
|
41 | 41 | |
|
42 | 42 | echo ==== qref -u |
|
43 | 43 | hg qref -u jane |
|
44 | 44 | catlog 2 |
|
45 | 45 | |
|
46 | 46 | |
|
47 | 47 | echo ==== qnew -U -m |
|
48 | 48 | hg qnew -U -m "Three" 3.patch |
|
49 | 49 | catlog 3 |
|
50 | 50 | |
|
51 | 51 | echo ==== qref |
|
52 | 52 | echo "3" >3 |
|
53 | 53 | hg add |
|
54 | 54 | hg qref |
|
55 | 55 | catlog 3 |
|
56 | 56 | |
|
57 | 57 | echo ==== qref -m |
|
58 | 58 | hg qref -m "Drei" |
|
59 | 59 | catlog 3 |
|
60 | 60 | |
|
61 | 61 | echo ==== qref -u |
|
62 | 62 | hg qref -u mary |
|
63 | 63 | catlog 3 |
|
64 | 64 | |
|
65 | 65 | echo ==== qref -u -m |
|
66 | 66 | hg qref -u maria -m "Three (again)" |
|
67 | 67 | catlog 3 |
|
68 | 68 | |
|
69 | 69 | echo ==== qnew -m |
|
70 | 70 | hg qnew -m "Four" 4.patch |
|
71 | 71 | echo "4" >4 |
|
72 | 72 | hg add |
|
73 | 73 | hg qref |
|
74 | 74 | catlog 4 |
|
75 | 75 | |
|
76 | 76 | echo ==== qref -u |
|
77 | 77 | hg qref -u jane |
|
78 | 78 | catlog 4 |
|
79 | 79 | |
|
80 | 80 | |
|
81 | 81 | echo ==== qnew with HG header |
|
82 | 82 | hg qnew 5.patch |
|
83 | 83 | hg qpop |
|
84 | 84 | echo "# HG changeset patch" >>.hg/patches/5.patch |
|
85 | 85 | echo "# User johndoe" >>.hg/patches/5.patch |
|
86 | # Drop patch specific error line | |
|
87 | hg qpush 2>&1 | grep -v garbage | |
|
86 | hg qpush 2>&1 | grep 'Now at' | |
|
88 | 87 | catlog 5 |
|
89 | 88 | |
|
90 | 89 | echo ==== hg qref |
|
91 | 90 | echo "5" >5 |
|
92 | 91 | hg add |
|
93 | 92 | hg qref |
|
94 | 93 | catlog 5 |
|
95 | 94 | |
|
96 | 95 | echo ==== hg qref -U |
|
97 | 96 | hg qref -U |
|
98 | 97 | catlog 5 |
|
99 | 98 | |
|
100 | 99 | echo ==== hg qref -u |
|
101 | 100 | hg qref -u johndeere |
|
102 | 101 | catlog 5 |
|
103 | 102 | |
|
104 | 103 | |
|
105 | 104 | echo ==== "qpop -a / qpush -a" |
|
106 | 105 | hg qpop -a |
|
107 | 106 | hg qpush -a |
|
108 | 107 | hg log --template "{rev}: {desc} - {author}\n" |
@@ -1,200 +1,197 b'' | |||
|
1 | 1 | ==== init |
|
2 | 2 | ==== qnew -U |
|
3 | 3 | From: test |
|
4 | 4 | |
|
5 | 5 | 0: [mq]: 1.patch - test |
|
6 | 6 | ==== qref |
|
7 | 7 | adding 1 |
|
8 | 8 | From: test |
|
9 | 9 | |
|
10 | 10 | diff -r ... 1 |
|
11 | 11 | --- /dev/null |
|
12 | 12 | +++ b/1 |
|
13 | 13 | @@ -0,0 +1,1 @@ |
|
14 | 14 | +1 |
|
15 | 15 | 0: [mq]: 1.patch - test |
|
16 | 16 | ==== qref -u |
|
17 | 17 | From: mary |
|
18 | 18 | |
|
19 | 19 | diff -r ... 1 |
|
20 | 20 | --- /dev/null |
|
21 | 21 | +++ b/1 |
|
22 | 22 | @@ -0,0 +1,1 @@ |
|
23 | 23 | +1 |
|
24 | 24 | 0: [mq]: 1.patch - mary |
|
25 | 25 | ==== qnew |
|
26 | 26 | adding 2 |
|
27 | 27 | diff -r ... 2 |
|
28 | 28 | --- /dev/null |
|
29 | 29 | +++ b/2 |
|
30 | 30 | @@ -0,0 +1,1 @@ |
|
31 | 31 | +2 |
|
32 | 32 | 1: [mq]: 2.patch - test |
|
33 | 33 | 0: [mq]: 1.patch - mary |
|
34 | 34 | ==== qref -u |
|
35 | 35 | From: jane |
|
36 | 36 | |
|
37 | 37 | |
|
38 | 38 | diff -r ... 2 |
|
39 | 39 | --- /dev/null |
|
40 | 40 | +++ b/2 |
|
41 | 41 | @@ -0,0 +1,1 @@ |
|
42 | 42 | +2 |
|
43 | 43 | 1: [mq]: 2.patch - jane |
|
44 | 44 | 0: [mq]: 1.patch - mary |
|
45 | 45 | ==== qnew -U -m |
|
46 | 46 | From: test |
|
47 | 47 | |
|
48 | 48 | Three |
|
49 | 49 | 2: Three - test |
|
50 | 50 | 1: [mq]: 2.patch - jane |
|
51 | 51 | 0: [mq]: 1.patch - mary |
|
52 | 52 | ==== qref |
|
53 | 53 | adding 3 |
|
54 | 54 | From: test |
|
55 | 55 | |
|
56 | 56 | Three |
|
57 | 57 | |
|
58 | 58 | diff -r ... 3 |
|
59 | 59 | --- /dev/null |
|
60 | 60 | +++ b/3 |
|
61 | 61 | @@ -0,0 +1,1 @@ |
|
62 | 62 | +3 |
|
63 | 63 | 2: Three - test |
|
64 | 64 | 1: [mq]: 2.patch - jane |
|
65 | 65 | 0: [mq]: 1.patch - mary |
|
66 | 66 | ==== qref -m |
|
67 | 67 | From: test |
|
68 | 68 | |
|
69 | 69 | Drei |
|
70 | 70 | |
|
71 | 71 | diff -r ... 3 |
|
72 | 72 | --- /dev/null |
|
73 | 73 | +++ b/3 |
|
74 | 74 | @@ -0,0 +1,1 @@ |
|
75 | 75 | +3 |
|
76 | 76 | 2: Drei - test |
|
77 | 77 | 1: [mq]: 2.patch - jane |
|
78 | 78 | 0: [mq]: 1.patch - mary |
|
79 | 79 | ==== qref -u |
|
80 | 80 | From: mary |
|
81 | 81 | |
|
82 | 82 | Drei |
|
83 | 83 | |
|
84 | 84 | diff -r ... 3 |
|
85 | 85 | --- /dev/null |
|
86 | 86 | +++ b/3 |
|
87 | 87 | @@ -0,0 +1,1 @@ |
|
88 | 88 | +3 |
|
89 | 89 | 2: Drei - mary |
|
90 | 90 | 1: [mq]: 2.patch - jane |
|
91 | 91 | 0: [mq]: 1.patch - mary |
|
92 | 92 | ==== qref -u -m |
|
93 | 93 | From: maria |
|
94 | 94 | |
|
95 | 95 | Three (again) |
|
96 | 96 | |
|
97 | 97 | diff -r ... 3 |
|
98 | 98 | --- /dev/null |
|
99 | 99 | +++ b/3 |
|
100 | 100 | @@ -0,0 +1,1 @@ |
|
101 | 101 | +3 |
|
102 | 102 | 2: Three (again) - maria |
|
103 | 103 | 1: [mq]: 2.patch - jane |
|
104 | 104 | 0: [mq]: 1.patch - mary |
|
105 | 105 | ==== qnew -m |
|
106 | 106 | adding 4 |
|
107 | 107 | Four |
|
108 | 108 | |
|
109 | 109 | diff -r ... 4 |
|
110 | 110 | --- /dev/null |
|
111 | 111 | +++ b/4 |
|
112 | 112 | @@ -0,0 +1,1 @@ |
|
113 | 113 | +4 |
|
114 | 114 | 3: Four - test |
|
115 | 115 | 2: Three (again) - maria |
|
116 | 116 | 1: [mq]: 2.patch - jane |
|
117 | 117 | 0: [mq]: 1.patch - mary |
|
118 | 118 | ==== qref -u |
|
119 | 119 | From: jane |
|
120 | 120 | |
|
121 | 121 | Four |
|
122 | 122 | |
|
123 | 123 | diff -r ... 4 |
|
124 | 124 | --- /dev/null |
|
125 | 125 | +++ b/4 |
|
126 | 126 | @@ -0,0 +1,1 @@ |
|
127 | 127 | +4 |
|
128 | 128 | 3: Four - jane |
|
129 | 129 | 2: Three (again) - maria |
|
130 | 130 | 1: [mq]: 2.patch - jane |
|
131 | 131 | 0: [mq]: 1.patch - mary |
|
132 | 132 | ==== qnew with HG header |
|
133 | 133 | Now at: 4.patch |
|
134 | applying 5.patch | |
|
135 | patch failed, unable to continue (try -v) | |
|
136 | patch 5.patch is empty | |
|
137 | 134 | Now at: 5.patch |
|
138 | 135 | # HG changeset patch |
|
139 | 136 | # User johndoe |
|
140 | 137 | 4: imported patch 5.patch - johndoe |
|
141 | 138 | 3: Four - jane |
|
142 | 139 | 2: Three (again) - maria |
|
143 | 140 | 1: [mq]: 2.patch - jane |
|
144 | 141 | 0: [mq]: 1.patch - mary |
|
145 | 142 | ==== hg qref |
|
146 | 143 | adding 5 |
|
147 | 144 | # HG changeset patch |
|
148 | 145 | # User johndoe |
|
149 | 146 | |
|
150 | 147 | diff -r ... 5 |
|
151 | 148 | --- /dev/null |
|
152 | 149 | +++ b/5 |
|
153 | 150 | @@ -0,0 +1,1 @@ |
|
154 | 151 | +5 |
|
155 | 152 | 4: [mq]: 5.patch - johndoe |
|
156 | 153 | 3: Four - jane |
|
157 | 154 | 2: Three (again) - maria |
|
158 | 155 | 1: [mq]: 2.patch - jane |
|
159 | 156 | 0: [mq]: 1.patch - mary |
|
160 | 157 | ==== hg qref -U |
|
161 | 158 | # HG changeset patch |
|
162 | 159 | # User test |
|
163 | 160 | |
|
164 | 161 | diff -r ... 5 |
|
165 | 162 | --- /dev/null |
|
166 | 163 | +++ b/5 |
|
167 | 164 | @@ -0,0 +1,1 @@ |
|
168 | 165 | +5 |
|
169 | 166 | 4: [mq]: 5.patch - test |
|
170 | 167 | 3: Four - jane |
|
171 | 168 | 2: Three (again) - maria |
|
172 | 169 | 1: [mq]: 2.patch - jane |
|
173 | 170 | 0: [mq]: 1.patch - mary |
|
174 | 171 | ==== hg qref -u |
|
175 | 172 | # HG changeset patch |
|
176 | 173 | # User johndeere |
|
177 | 174 | |
|
178 | 175 | diff -r ... 5 |
|
179 | 176 | --- /dev/null |
|
180 | 177 | +++ b/5 |
|
181 | 178 | @@ -0,0 +1,1 @@ |
|
182 | 179 | +5 |
|
183 | 180 | 4: [mq]: 5.patch - johndeere |
|
184 | 181 | 3: Four - jane |
|
185 | 182 | 2: Three (again) - maria |
|
186 | 183 | 1: [mq]: 2.patch - jane |
|
187 | 184 | 0: [mq]: 1.patch - mary |
|
188 | 185 | ==== qpop -a / qpush -a |
|
189 | 186 | Patch queue now empty |
|
190 | 187 | applying 1.patch |
|
191 | 188 | applying 2.patch |
|
192 | 189 | applying 3.patch |
|
193 | 190 | applying 4.patch |
|
194 | 191 | applying 5.patch |
|
195 | 192 | Now at: 5.patch |
|
196 | 193 | 4: imported patch 5.patch - johndeere |
|
197 | 194 | 3: Four - jane |
|
198 | 195 | 2: Three (again) - maria |
|
199 | 196 | 1: imported patch 2.patch - jane |
|
200 | 197 | 0: imported patch 1.patch - mary |
General Comments 0
You need to be logged in to leave comments.
Login now