65 |
65 |
66 Split commits two by two |
66 Split commits two by two |
67 ------------------------ |
67 ------------------------ |
68 |
68 |
69 $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0" |
69 $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0" |
70 4 new orphan changesets |
|
71 2 changesets folded |
70 2 changesets folded |
72 $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1" |
71 $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1" |
73 2 changesets folded |
72 2 changesets folded |
74 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test" |
73 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test" |
75 2 changesets folded |
74 2 changesets folded |
92 | user: test |
91 | user: test |
93 | date: Thu Jan 01 00:00:00 1970 +0000 |
92 | date: Thu Jan 01 00:00:00 1970 +0000 |
94 | instability: orphan |
93 | instability: orphan |
95 | summary: fold2 |
94 | summary: fold2 |
96 | |
95 | |
97 | * changeset: 8:d15d0ffc75f6 |
96 | o changeset: 8:d15d0ffc75f6 |
98 | | parent: 2:c473644ee0e9 |
97 | | parent: 2:c473644ee0e9 |
99 | | user: test |
98 | | user: test |
100 | | date: Thu Jan 01 00:00:00 1970 +0000 |
99 | | date: Thu Jan 01 00:00:00 1970 +0000 |
101 | | instability: orphan |
100 | | instability: orphan |
102 | | summary: fold1 |
101 | | summary: fold1 |
241 @@ -0,0 +1,1 @@ |
239 @@ -0,0 +1,1 @@ |
242 +F |
240 +F |
243 record this change to 'F'? [Ynesfdaq?] Y |
241 record this change to 'F'? [Ynesfdaq?] Y |
244 |
242 |
245 no more change to split |
243 no more change to split |
246 1 new orphan changesets |
|
247 $ hg log -G |
244 $ hg log -G |
248 @ changeset: 15:d4a000f63ee9 |
245 @ changeset: 15:d4a000f63ee9 |
249 | tag: tip |
246 | tag: tip |
250 | user: test |
247 | user: test |
251 | date: Thu Jan 01 00:00:00 1970 +0000 |
248 | date: Thu Jan 01 00:00:00 1970 +0000 |
252 | instability: orphan |
249 | instability: orphan |
253 | summary: fold2 |
250 | summary: fold2 |
254 | |
251 | |
255 * changeset: 14:ec31316faa9d |
252 o changeset: 14:ec31316faa9d |
256 | parent: 4:868d2e0eb19c |
253 | parent: 4:868d2e0eb19c |
257 | user: test |
254 | user: test |
258 | date: Thu Jan 01 00:00:00 1970 +0000 |
255 | date: Thu Jan 01 00:00:00 1970 +0000 |
259 | instability: orphan |
256 | instability: orphan |
260 | summary: fold2 |
257 | summary: fold2 |
261 | |
258 | |
262 | * changeset: 13:d0f33db50670 |
259 | o changeset: 13:d0f33db50670 |
263 | | user: test |
260 | | user: test |
264 | | date: Thu Jan 01 00:00:00 1970 +0000 |
261 | | date: Thu Jan 01 00:00:00 1970 +0000 |
265 | | instability: orphan |
262 | | instability: orphan |
266 | | summary: fold1 |
263 | | summary: fold1 |
267 | | |
264 | | |
268 | * changeset: 12:7b3290f6e0a0 |
265 | o changeset: 12:7b3290f6e0a0 |
269 | | parent: 2:c473644ee0e9 |
266 | | parent: 2:c473644ee0e9 |
270 | | user: test |
267 | | user: test |
271 | | date: Thu Jan 01 00:00:00 1970 +0000 |
268 | | date: Thu Jan 01 00:00:00 1970 +0000 |
272 | | instability: orphan |
269 | | instability: orphan |
273 | | summary: fold1 |
270 | | summary: fold1 |
326 | user: test |
323 | user: test |
327 | date: Thu Jan 01 00:00:00 1970 +0000 |
324 | date: Thu Jan 01 00:00:00 1970 +0000 |
328 | instability: orphan |
325 | instability: orphan |
329 | summary: fold2 |
326 | summary: fold2 |
330 | |
327 | |
331 * changeset: 14:ec31316faa9d |
328 o changeset: 14:ec31316faa9d |
332 | parent: 4:868d2e0eb19c |
329 | parent: 4:868d2e0eb19c |
333 | user: test |
330 | user: test |
334 | date: Thu Jan 01 00:00:00 1970 +0000 |
331 | date: Thu Jan 01 00:00:00 1970 +0000 |
335 | instability: orphan |
332 | instability: orphan |
336 | summary: fold2 |
333 | summary: fold2 |
337 | |
334 | |
338 | * changeset: 12:7b3290f6e0a0 |
335 | o changeset: 12:7b3290f6e0a0 |
339 | | parent: 2:c473644ee0e9 |
336 | | parent: 2:c473644ee0e9 |
340 | | user: test |
337 | | user: test |
341 | | date: Thu Jan 01 00:00:00 1970 +0000 |
338 | | date: Thu Jan 01 00:00:00 1970 +0000 |
342 | | instability: orphan |
339 | | instability: orphan |
343 | | summary: fold1 |
340 | | summary: fold1 |
382 |
379 |
383 Obslog should show a subset of the obs history, this test check that the |
380 Obslog should show a subset of the obs history, this test check that the |
384 walking algorithm works no matter the level of successors + precursors |
381 walking algorithm works no matter the level of successors + precursors |
385 |
382 |
386 $ hg obslog 12 |
383 $ hg obslog 12 |
387 * 7b3290f6e0a0 (12) fold1 |
384 o 7b3290f6e0a0 (12) fold1 |
388 |\ |
385 |\ |
389 x | d15d0ffc75f6 (8) fold1 |
386 x | d15d0ffc75f6 (8) fold1 |
390 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
387 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
391 | | | |
388 | | | |
392 | | x e036916b63ea (11) fold0 |
389 | | x e036916b63ea (11) fold0 |
410 While with all option, we should see 15 changesets |
407 While with all option, we should see 15 changesets |
411 |
408 |
412 $ hg obslog --all 15 |
409 $ hg obslog --all 15 |
413 o 19e14c8397fc (10) fold0 |
410 o 19e14c8397fc (10) fold0 |
414 | |
411 | |
415 | * 7b3290f6e0a0 (12) fold1 |
412 | o 7b3290f6e0a0 (12) fold1 |
416 | |\ |
413 | |\ |
417 | | | @ d4a000f63ee9 (15) fold2 |
414 | | | @ d4a000f63ee9 (15) fold2 |
418 | | | | |
415 | | | | |
419 | | | | * ec31316faa9d (14) fold2 |
416 | | | | o ec31316faa9d (14) fold2 |
420 | | | |/| |
417 | | | |/| |
421 | | | x | 100cc25b765f (9) fold2 |
418 | | | x | 100cc25b765f (9) fold2 |
422 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000) |
419 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000) |
423 | | | | | | |
420 | | | | | | |
424 | +-------x d0f33db50670 (13) fold1 |
421 | +-------x d0f33db50670 (13) fold1 |