##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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