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