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 2 changesets folded |
71 4 new orphan changesets |
71 4 new unstable changesets |
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 current hg version does not support storing note in obsmarker |
75 2 changesets folded |
76 2 changesets folded |
76 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
77 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
77 $ hg obslog -r . |
78 $ hg obslog -r . |
78 @ 100cc25b765f (9) fold2 |
79 @ 100cc25b765f (9) fold2 |
79 |\ |
80 |\ |
80 x | 0da815c333f6 (5) E |
81 x | 0da815c333f6 (5) E |
81 / rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
82 / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) |
82 | note: folding changesets to test |
83 | note: folding changesets to test |
83 | |
84 | |
84 x d9f908fde1a1 (6) F |
85 x d9f908fde1a1 (6) F |
85 rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
86 rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) |
86 note: folding changesets to test |
87 note: folding changesets to test |
87 |
88 |
88 $ hg log -G |
89 $ hg log -G |
89 @ changeset: 9:100cc25b765f |
90 @ changeset: 9:100cc25b765f |
90 | tag: tip |
91 | tag: tip |
91 | parent: 4:868d2e0eb19c |
92 | parent: 4:868d2e0eb19c |
92 | user: test |
93 | user: test |
93 | date: Thu Jan 01 00:00:00 1970 +0000 |
94 | date: Thu Jan 01 00:00:00 1970 +0000 |
94 | instability: orphan |
95 | trouble: unstable |
95 | summary: fold2 |
96 | summary: fold2 |
96 | |
97 | |
97 | o changeset: 8:d15d0ffc75f6 |
98 | o changeset: 8:d15d0ffc75f6 |
98 | | parent: 2:c473644ee0e9 |
99 | | parent: 2:c473644ee0e9 |
99 | | user: test |
100 | | user: test |
100 | | date: Thu Jan 01 00:00:00 1970 +0000 |
101 | | date: Thu Jan 01 00:00:00 1970 +0000 |
101 | | instability: orphan |
102 | | trouble: unstable |
102 | | summary: fold1 |
103 | | summary: fold1 |
103 | | |
104 | | |
104 | | o changeset: 7:b868bc49b0a4 |
105 | | o changeset: 7:b868bc49b0a4 |
105 | | | parent: 0:ea207398892e |
106 | | | parent: 0:ea207398892e |
106 | | | user: test |
107 | | | user: test |
108 | | | summary: fold0 |
109 | | | summary: fold0 |
109 | | | |
110 | | | |
110 x | | changeset: 4:868d2e0eb19c |
111 x | | changeset: 4:868d2e0eb19c |
111 | | | user: test |
112 | | | user: test |
112 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
113 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
113 | | | obsolete: rewritten using fold as 8:d15d0ffc75f6 |
114 | | | obsolete: rewritten as d15d0ffc75f6 |
114 | | | summary: D |
115 | | | summary: D |
115 | | | |
116 | | | |
116 x | | changeset: 3:a8df460dbbfe |
117 x | | changeset: 3:a8df460dbbfe |
117 |/ / user: test |
118 |/ / user: test |
118 | | date: Thu Jan 01 00:00:00 1970 +0000 |
119 | | date: Thu Jan 01 00:00:00 1970 +0000 |
119 | | obsolete: rewritten using fold as 8:d15d0ffc75f6 |
120 | | obsolete: rewritten as d15d0ffc75f6 |
120 | | summary: C |
121 | | summary: C |
121 | | |
122 | | |
122 x | changeset: 2:c473644ee0e9 |
123 x | changeset: 2:c473644ee0e9 |
123 | | user: test |
124 | | user: test |
124 | | date: Thu Jan 01 00:00:00 1970 +0000 |
125 | | date: Thu Jan 01 00:00:00 1970 +0000 |
125 | | obsolete: rewritten using fold as 7:b868bc49b0a4 |
126 | | obsolete: rewritten as b868bc49b0a4 |
126 | | summary: B |
127 | | summary: B |
127 | | |
128 | | |
128 x | changeset: 1:2a34000d3544 |
129 x | changeset: 1:2a34000d3544 |
129 |/ user: test |
130 |/ user: test |
130 | date: Thu Jan 01 00:00:00 1970 +0000 |
131 | date: Thu Jan 01 00:00:00 1970 +0000 |
131 | obsolete: rewritten using fold as 7:b868bc49b0a4 |
132 | obsolete: rewritten as b868bc49b0a4 |
132 | summary: A |
133 | summary: A |
133 | |
134 | |
134 o changeset: 0:ea207398892e |
135 o changeset: 0:ea207398892e |
135 user: test |
136 user: test |
136 date: Thu Jan 01 00:00:00 1970 +0000 |
137 date: Thu Jan 01 00:00:00 1970 +0000 |
245 $ hg log -G |
246 $ hg log -G |
246 @ changeset: 15:d4a000f63ee9 |
247 @ changeset: 15:d4a000f63ee9 |
247 | tag: tip |
248 | tag: tip |
248 | user: test |
249 | user: test |
249 | date: Thu Jan 01 00:00:00 1970 +0000 |
250 | date: Thu Jan 01 00:00:00 1970 +0000 |
250 | instability: orphan |
251 | trouble: unstable |
251 | summary: fold2 |
252 | summary: fold2 |
252 | |
253 | |
253 o changeset: 14:ec31316faa9d |
254 o changeset: 14:ec31316faa9d |
254 | parent: 4:868d2e0eb19c |
255 | parent: 4:868d2e0eb19c |
255 | user: test |
256 | user: test |
256 | date: Thu Jan 01 00:00:00 1970 +0000 |
257 | date: Thu Jan 01 00:00:00 1970 +0000 |
257 | instability: orphan |
258 | trouble: unstable |
258 | summary: fold2 |
259 | summary: fold2 |
259 | |
260 | |
260 | o changeset: 13:d0f33db50670 |
261 | o changeset: 13:d0f33db50670 |
261 | | user: test |
262 | | user: test |
262 | | date: Thu Jan 01 00:00:00 1970 +0000 |
263 | | date: Thu Jan 01 00:00:00 1970 +0000 |
263 | | instability: orphan |
264 | | trouble: unstable |
264 | | summary: fold1 |
265 | | summary: fold1 |
265 | | |
266 | | |
266 | o changeset: 12:7b3290f6e0a0 |
267 | o changeset: 12:7b3290f6e0a0 |
267 | | parent: 2:c473644ee0e9 |
268 | | parent: 2:c473644ee0e9 |
268 | | user: test |
269 | | user: test |
269 | | date: Thu Jan 01 00:00:00 1970 +0000 |
270 | | date: Thu Jan 01 00:00:00 1970 +0000 |
270 | | instability: orphan |
271 | | trouble: unstable |
271 | | summary: fold1 |
272 | | summary: fold1 |
272 | | |
273 | | |
273 | | o changeset: 11:e036916b63ea |
274 | | o changeset: 11:e036916b63ea |
274 | | | user: test |
275 | | | user: test |
275 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
276 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
282 | | | summary: fold0 |
283 | | | summary: fold0 |
283 | | | |
284 | | | |
284 x | | changeset: 4:868d2e0eb19c |
285 x | | changeset: 4:868d2e0eb19c |
285 | | | user: test |
286 | | | user: test |
286 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
287 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
287 | | | obsolete: split using fold, split as 12:7b3290f6e0a0, 13:d0f33db50670 |
288 | | | obsolete: split as 7b3290f6e0a0, d0f33db50670 |
288 | | | summary: D |
289 | | | summary: D |
289 | | | |
290 | | | |
290 x | | changeset: 3:a8df460dbbfe |
291 x | | changeset: 3:a8df460dbbfe |
291 |/ / user: test |
292 |/ / user: test |
292 | | date: Thu Jan 01 00:00:00 1970 +0000 |
293 | | date: Thu Jan 01 00:00:00 1970 +0000 |
293 | | obsolete: split using fold, split as 12:7b3290f6e0a0, 13:d0f33db50670 |
294 | | obsolete: split as 7b3290f6e0a0, d0f33db50670 |
294 | | summary: C |
295 | | summary: C |
295 | | |
296 | | |
296 x | changeset: 2:c473644ee0e9 |
297 x | changeset: 2:c473644ee0e9 |
297 | | user: test |
298 | | user: test |
298 | | date: Thu Jan 01 00:00:00 1970 +0000 |
299 | | date: Thu Jan 01 00:00:00 1970 +0000 |
299 | | obsolete: split using fold, split as 10:19e14c8397fc, 11:e036916b63ea |
300 | | obsolete: split as 19e14c8397fc, e036916b63ea |
300 | | summary: B |
301 | | summary: B |
301 | | |
302 | | |
302 x | changeset: 1:2a34000d3544 |
303 x | changeset: 1:2a34000d3544 |
303 |/ user: test |
304 |/ user: test |
304 | date: Thu Jan 01 00:00:00 1970 +0000 |
305 | date: Thu Jan 01 00:00:00 1970 +0000 |
305 | obsolete: split using fold, split as 10:19e14c8397fc, 11:e036916b63ea |
306 | obsolete: split as 19e14c8397fc, e036916b63ea |
306 | summary: A |
307 | summary: A |
307 | |
308 | |
308 o changeset: 0:ea207398892e |
309 o changeset: 0:ea207398892e |
309 user: test |
310 user: test |
310 date: Thu Jan 01 00:00:00 1970 +0000 |
311 date: Thu Jan 01 00:00:00 1970 +0000 |
315 ---------------- |
316 ---------------- |
316 |
317 |
317 $ hg prune -s 12 -r 11 |
318 $ hg prune -s 12 -r 11 |
318 1 changesets pruned |
319 1 changesets pruned |
319 $ hg prune -s 14 -r 13 -n "this is a note stored in obsmarker in prune" |
320 $ hg prune -s 14 -r 13 -n "this is a note stored in obsmarker in prune" |
|
321 current hg version does not support storing note in obsmarker |
320 1 changesets pruned |
322 1 changesets pruned |
321 $ hg log -G |
323 $ hg log -G |
322 @ changeset: 15:d4a000f63ee9 |
324 @ changeset: 15:d4a000f63ee9 |
323 | tag: tip |
325 | tag: tip |
324 | user: test |
326 | user: test |
325 | date: Thu Jan 01 00:00:00 1970 +0000 |
327 | date: Thu Jan 01 00:00:00 1970 +0000 |
326 | instability: orphan |
328 | trouble: unstable |
327 | summary: fold2 |
329 | summary: fold2 |
328 | |
330 | |
329 o changeset: 14:ec31316faa9d |
331 o changeset: 14:ec31316faa9d |
330 | parent: 4:868d2e0eb19c |
332 | parent: 4:868d2e0eb19c |
331 | user: test |
333 | user: test |
332 | date: Thu Jan 01 00:00:00 1970 +0000 |
334 | date: Thu Jan 01 00:00:00 1970 +0000 |
333 | instability: orphan |
335 | trouble: unstable |
334 | summary: fold2 |
336 | summary: fold2 |
335 | |
337 | |
336 | o changeset: 12:7b3290f6e0a0 |
338 | o changeset: 12:7b3290f6e0a0 |
337 | | parent: 2:c473644ee0e9 |
339 | | parent: 2:c473644ee0e9 |
338 | | user: test |
340 | | user: test |
339 | | date: Thu Jan 01 00:00:00 1970 +0000 |
341 | | date: Thu Jan 01 00:00:00 1970 +0000 |
340 | | instability: orphan |
342 | | trouble: unstable |
341 | | summary: fold1 |
343 | | summary: fold1 |
342 | | |
344 | | |
343 | | o changeset: 10:19e14c8397fc |
345 | | o changeset: 10:19e14c8397fc |
344 | | | parent: 0:ea207398892e |
346 | | | parent: 0:ea207398892e |
345 | | | user: test |
347 | | | user: test |
347 | | | summary: fold0 |
349 | | | summary: fold0 |
348 | | | |
350 | | | |
349 x | | changeset: 4:868d2e0eb19c |
351 x | | changeset: 4:868d2e0eb19c |
350 | | | user: test |
352 | | | user: test |
351 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
353 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
352 | | | obsolete: split using fold, prune, split as 12:7b3290f6e0a0, 14:ec31316faa9d |
354 | | | obsolete: split as 7b3290f6e0a0, ec31316faa9d |
353 | | | summary: D |
355 | | | summary: D |
354 | | | |
356 | | | |
355 x | | changeset: 3:a8df460dbbfe |
357 x | | changeset: 3:a8df460dbbfe |
356 |/ / user: test |
358 |/ / user: test |
357 | | date: Thu Jan 01 00:00:00 1970 +0000 |
359 | | date: Thu Jan 01 00:00:00 1970 +0000 |
358 | | obsolete: split using fold, prune, split as 12:7b3290f6e0a0, 14:ec31316faa9d |
360 | | obsolete: split as 7b3290f6e0a0, ec31316faa9d |
359 | | summary: C |
361 | | summary: C |
360 | | |
362 | | |
361 x | changeset: 2:c473644ee0e9 |
363 x | changeset: 2:c473644ee0e9 |
362 | | user: test |
364 | | user: test |
363 | | date: Thu Jan 01 00:00:00 1970 +0000 |
365 | | date: Thu Jan 01 00:00:00 1970 +0000 |
364 | | obsolete: split using fold, prune, split as 10:19e14c8397fc, 12:7b3290f6e0a0 |
366 | | obsolete: split as 19e14c8397fc, 7b3290f6e0a0 |
365 | | summary: B |
367 | | summary: B |
366 | | |
368 | | |
367 x | changeset: 1:2a34000d3544 |
369 x | changeset: 1:2a34000d3544 |
368 |/ user: test |
370 |/ user: test |
369 | date: Thu Jan 01 00:00:00 1970 +0000 |
371 | date: Thu Jan 01 00:00:00 1970 +0000 |
370 | obsolete: split using fold, prune, split as 10:19e14c8397fc, 12:7b3290f6e0a0 |
372 | obsolete: split as 19e14c8397fc, 7b3290f6e0a0 |
371 | summary: A |
373 | summary: A |
372 | |
374 | |
373 o changeset: 0:ea207398892e |
375 o changeset: 0:ea207398892e |
374 user: test |
376 user: test |
375 date: Thu Jan 01 00:00:00 1970 +0000 |
377 date: Thu Jan 01 00:00:00 1970 +0000 |
383 |
385 |
384 $ hg obslog 12 |
386 $ hg obslog 12 |
385 o 7b3290f6e0a0 (12) fold1 |
387 o 7b3290f6e0a0 (12) fold1 |
386 |\ |
388 |\ |
387 x | d15d0ffc75f6 (8) fold1 |
389 x | d15d0ffc75f6 (8) fold1 |
388 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
390 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) |
389 | | | |
391 | | | |
390 | | x e036916b63ea (11) fold0 |
392 | | x e036916b63ea (11) fold0 |
391 | | | rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
393 | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) |
392 | | | |
394 | | | |
393 x | | 868d2e0eb19c (4) D |
395 x | | 868d2e0eb19c (4) D |
394 / / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
396 / / rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) |
395 | | |
397 | | |
396 x | a8df460dbbfe (3) C |
398 x | a8df460dbbfe (3) C |
397 / rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
399 / rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) |
398 | |
400 | |
399 x b868bc49b0a4 (7) fold0 |
401 x b868bc49b0a4 (7) fold0 |
400 |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000) |
402 |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000) |
401 | | |
403 | | |
402 x | 2a34000d3544 (1) A |
404 x | 2a34000d3544 (1) A |
403 / rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
405 / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) |
404 | |
406 | |
405 x c473644ee0e9 (2) B |
407 x c473644ee0e9 (2) B |
406 rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
408 rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) |
407 |
409 |
408 While with all option, we should see 15 changesets |
410 While with all option, we should see 15 changesets |
409 |
411 |
410 $ hg obslog --all 15 |
412 $ hg obslog --all 15 |
411 o 19e14c8397fc (10) fold0 |
413 o 19e14c8397fc (10) fold0 |
415 | | | @ d4a000f63ee9 (15) fold2 |
417 | | | @ d4a000f63ee9 (15) fold2 |
416 | | | | |
418 | | | | |
417 | | | | o ec31316faa9d (14) fold2 |
419 | | | | o ec31316faa9d (14) fold2 |
418 | | | |/| |
420 | | | |/| |
419 | | | x | 100cc25b765f (9) fold2 |
421 | | | x | 100cc25b765f (9) fold2 |
420 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000) |
422 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) |
421 | | | | | | |
423 | | | | | | |
422 | +-------x d0f33db50670 (13) fold1 |
424 | +-------x d0f33db50670 (13) fold1 |
423 | | | | | rewritten(description, parent, content) as ec31316faa9d using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
425 | | | | | rewritten(description, parent, content) as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) |
424 | | | | | note: this is a note stored in obsmarker in prune |
426 | | | | | note: this is a note stored in obsmarker in prune |
425 | | | | | |
427 | | | | | |
426 +---x | | e036916b63ea (11) fold0 |
428 +---x | | e036916b63ea (11) fold0 |
427 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
429 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) |
428 | | | | |
430 | | | | |
429 | | x | 0da815c333f6 (5) E |
431 | | x | 0da815c333f6 (5) E |
430 | | / rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
432 | | / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) |
431 | | | note: folding changesets to test |
433 | | | note: folding changesets to test |
432 | | | |
434 | | | |
433 x | | b868bc49b0a4 (7) fold0 |
435 x | | b868bc49b0a4 (7) fold0 |
434 |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000) |
436 |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000) |
435 | | | | |
437 | | | | |
436 | | x | d15d0ffc75f6 (8) fold1 |
438 | | x | d15d0ffc75f6 (8) fold1 |
437 | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
439 | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) |
438 | | | | | |
440 | | | | | |
439 | | | | x d9f908fde1a1 (6) F |
441 | | | | x d9f908fde1a1 (6) F |
440 | | | | rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
442 | | | | rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) |
441 | | | | note: folding changesets to test |
443 | | | | note: folding changesets to test |
442 | | | | |
444 | | | | |
443 x | | | 2a34000d3544 (1) A |
445 x | | | 2a34000d3544 (1) A |
444 / / / rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
446 / / / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) |
445 | | | |
447 | | | |
446 | x | 868d2e0eb19c (4) D |
448 | x | 868d2e0eb19c (4) D |
447 | / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
449 | / rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) |
448 | | |
450 | | |
449 | x a8df460dbbfe (3) C |
451 | x a8df460dbbfe (3) C |
450 | rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
452 | rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) |
451 | |
453 | |
452 x c473644ee0e9 (2) B |
454 x c473644ee0e9 (2) B |
453 rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
455 rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) |
454 |
456 |