##// END OF EJS Templates
test-backout: add multiple summary calls to monitor result wc...
Pierre-Yves David -
r20270:0763d829 default
parent child Browse files
Show More
@@ -23,6 +23,12 b' basic operation'
23 changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57
23 changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57
24 $ cat a
24 $ cat a
25 a
25 a
26 $ hg summary
27 parent: 2:2929462c3dff tip
28 Backed out changeset a820f4f40a57
29 branch: default
30 commit: (clean)
31 update: (current)
26
32
27 file that was removed is recreated
33 file that was removed is recreated
28
34
@@ -42,6 +48,12 b' file that was removed is recreated'
42 changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372
48 changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372
43 $ cat a
49 $ cat a
44 content
50 content
51 $ hg summary
52 parent: 2:de31bdc76c0d tip
53 Backed out changeset 76862dcce372
54 branch: default
55 commit: (clean)
56 update: (current)
45
57
46 backout of backout is as if nothing happened
58 backout of backout is as if nothing happened
47
59
@@ -50,6 +62,12 b' backout of backout is as if nothing happ'
50 changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d
62 changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d
51 $ test -f a
63 $ test -f a
52 [1]
64 [1]
65 $ hg summary
66 parent: 3:7f6d0f120113 tip
67 Backed out changeset de31bdc76c0d
68 branch: default
69 commit: (clean)
70 update: (current)
53
71
54 across branch
72 across branch
55
73
@@ -64,6 +82,12 b' across branch'
64 adding b
82 adding b
65 $ hg co -C 0
83 $ hg co -C 0
66 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
84 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
85 $ hg summary
86 parent: 0:f7b1eb17ad24
87 0
88 branch: default
89 commit: (clean)
90 update: 1 new changesets (update)
67
91
68 should fail
92 should fail
69
93
@@ -74,12 +98,24 b' should fail'
74 $ hg ci -Am2
98 $ hg ci -Am2
75 adding c
99 adding c
76 created new head
100 created new head
101 $ hg summary
102 parent: 2:db815d6d32e6 tip
103 2
104 branch: default
105 commit: (clean)
106 update: 1 new changesets, 2 branch heads (merge)
77
107
78 should fail
108 should fail
79
109
80 $ hg backout 1
110 $ hg backout 1
81 abort: cannot backout change on a different branch
111 abort: cannot backout change on a different branch
82 [255]
112 [255]
113 $ hg summary
114 parent: 2:db815d6d32e6 tip
115 2
116 branch: default
117 commit: (clean)
118 update: 1 new changesets, 2 branch heads (merge)
83
119
84 backout with merge
120 backout with merge
85
121
@@ -91,6 +127,12 b' backout with merge'
91 $ echo line 2 >> a
127 $ echo line 2 >> a
92 $ hg commit -d '0 0' -A -m a
128 $ hg commit -d '0 0' -A -m a
93 adding a
129 adding a
130 $ hg summary
131 parent: 0:59395513a13a tip
132 a
133 branch: default
134 commit: (clean)
135 update: (current)
94
136
95 remove line 1
137 remove line 1
96
138
@@ -109,6 +151,12 b' remove line 1'
109 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
151 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
110 (branch merge, don't forget to commit)
152 (branch merge, don't forget to commit)
111 $ hg commit -d '4 0' -m d
153 $ hg commit -d '4 0' -m d
154 $ hg summary
155 parent: 4:c7df5e0b9c09 tip
156 d
157 branch: default
158 commit: (clean)
159 update: (current)
112
160
113 check line 1 is back
161 check line 1 is back
114
162
@@ -131,6 +179,12 b' backout should not back out subsequent c'
131 $ echo 1 > b
179 $ echo 1 > b
132 $ hg commit -d '2 0' -A -m c
180 $ hg commit -d '2 0' -A -m c
133 adding b
181 adding b
182 $ hg summary
183 parent: 2:882396649954 tip
184 c
185 branch: default
186 commit: (clean)
187 update: (current)
134
188
135 without --merge
189 without --merge
136 $ hg backout -d '3 0' 1 --tool=true
190 $ hg backout -d '3 0' 1 --tool=true
@@ -142,6 +196,12 b' without --merge'
142 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
196 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
143 $ hg locate b
197 $ hg locate b
144 b
198 b
199 $ hg summary
200 parent: 2:882396649954 tip
201 c
202 branch: default
203 commit: (clean)
204 update: (current)
145
205
146 with --merge
206 with --merge
147 $ hg backout --merge -d '3 0' 1 --tool=true
207 $ hg backout --merge -d '3 0' 1 --tool=true
@@ -180,6 +240,12 b' with --merge'
180 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
240 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
181 (branch merge, don't forget to commit)
241 (branch merge, don't forget to commit)
182 $ hg commit -d '4 0' -A -m d
242 $ hg commit -d '4 0' -A -m d
243 $ hg summary
244 parent: 4:b2f3bb92043e tip
245 d
246 branch: default
247 commit: (clean)
248 update: (current)
183
249
184 backout of merge should fail
250 backout of merge should fail
185
251
@@ -204,16 +270,34 b' backout with valid parent should be ok'
204 $ hg backout -d '5 0' --parent 2 4 --tool=true
270 $ hg backout -d '5 0' --parent 2 4 --tool=true
205 removing d
271 removing d
206 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
272 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
273 $ hg summary
274 parent: 5:10e5328c8435 tip
275 Backed out changeset b2f3bb92043e
276 branch: default
277 commit: (clean)
278 update: (current)
207
279
208 $ hg rollback
280 $ hg rollback
209 repository tip rolled back to revision 4 (undo commit)
281 repository tip rolled back to revision 4 (undo commit)
210 working directory now based on revision 4
282 working directory now based on revision 4
211 $ hg update -C
283 $ hg update -C
212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
284 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
285 $ hg summary
286 parent: 4:b2f3bb92043e tip
287 d
288 branch: default
289 commit: (clean)
290 update: (current)
213
291
214 $ hg backout -d '6 0' --parent 3 4 --tool=true
292 $ hg backout -d '6 0' --parent 3 4 --tool=true
215 removing c
293 removing c
216 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
294 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
295 $ hg summary
296 parent: 5:033590168430 tip
297 Backed out changeset b2f3bb92043e
298 branch: default
299 commit: (clean)
300 update: (current)
217
301
218 $ cd ..
302 $ cd ..
219
303
@@ -248,6 +332,12 b' without --merge'
248 R file1
332 R file1
249 C default
333 C default
250 C file2
334 C file2
335 $ hg summary
336 parent: 2:45bbcd363bf0 tip
337 file2
338 branch: branch2
339 commit: 1 removed
340 update: (current)
251
341
252 with --merge
342 with --merge
253 $ hg update -qC
343 $ hg update -qC
@@ -258,6 +348,14 b' with --merge'
258 merging with changeset 3:d4e8f6db59fb
348 merging with changeset 3:d4e8f6db59fb
259 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
349 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
260 (branch merge, don't forget to commit)
350 (branch merge, don't forget to commit)
351 $ hg summary
352 parent: 2:45bbcd363bf0
353 file2
354 parent: 3:d4e8f6db59fb tip
355 backout on branch1
356 branch: branch2
357 commit: 1 removed (merge)
358 update: (current)
261 $ hg update -q -C 2
359 $ hg update -q -C 2
262
360
263 on branch2 with branch1 not merged, so file1 should still exist:
361 on branch2 with branch1 not merged, so file1 should still exist:
@@ -268,6 +366,12 b' on branch2 with branch1 not merged, so f'
268 C default
366 C default
269 C file1
367 C file1
270 C file2
368 C file2
369 $ hg summary
370 parent: 2:45bbcd363bf0
371 file2
372 branch: branch2
373 commit: (clean)
374 update: 1 new changesets, 2 branch heads (merge)
271
375
272 on branch2 with branch1 merged, so file1 should be gone:
376 on branch2 with branch1 merged, so file1 should be gone:
273
377
@@ -280,6 +384,12 b' on branch2 with branch1 merged, so file1'
280 $ hg st -A
384 $ hg st -A
281 C default
385 C default
282 C file2
386 C file2
387 $ hg summary
388 parent: 4:22149cdde76d tip
389 merge backout of branch1
390 branch: branch2
391 commit: (clean)
392 update: (current)
283
393
284 on branch1, so no file1 and file2:
394 on branch1, so no file1 and file2:
285
395
@@ -290,5 +400,11 b' on branch1, so no file1 and file2:'
290 $ hg st -A
400 $ hg st -A
291 C default
401 C default
292 C file1
402 C file1
403 $ hg summary
404 parent: 1:bf1602f437f3
405 file1
406 branch: branch1
407 commit: (clean)
408 update: (current)
293
409
294 $ cd ..
410 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now