equal
deleted
inserted
replaced
31 $ getid 2 |
31 $ getid 2 |
32 4538525df7e2b9f09423636c61ef63a4cb872a2d |
32 4538525df7e2b9f09423636c61ef63a4cb872a2d |
33 $ getid 3 |
33 $ getid 3 |
34 0d3f46688ccc6e756c7e96cf64c391c411309597 |
34 0d3f46688ccc6e756c7e96cf64c391c411309597 |
35 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 |
35 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 |
36 1 new obsolescence markers |
|
37 obsoleted 1 changesets |
36 obsoleted 1 changesets |
38 $ hg debugobsolete |
37 $ hg debugobsolete |
39 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
38 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
40 |
39 |
41 |
40 |
96 test obsolete changeset with non-obsolete descendant |
95 test obsolete changeset with non-obsolete descendant |
97 $ hg up 1 -q |
96 $ hg up 1 -q |
98 $ mkcommit "obsol_c'" # 4 (on 1) |
97 $ mkcommit "obsol_c'" # 4 (on 1) |
99 created new head |
98 created new head |
100 $ hg debugobsolete `getid 3` `getid 4` |
99 $ hg debugobsolete `getid 3` `getid 4` |
101 1 new obsolescence markers |
|
102 obsoleted 1 changesets |
100 obsoleted 1 changesets |
103 $ qlog |
101 $ qlog |
104 4 |
102 4 |
105 - 725c380fe99b |
103 - 725c380fe99b |
106 1 |
104 1 |
215 working directory parent is obsolete! (0d3f46688ccc) |
213 working directory parent is obsolete! (0d3f46688ccc) |
216 $ mkcommit obsol_d # 6 |
214 $ mkcommit obsol_d # 6 |
217 1 new orphan changesets |
215 1 new orphan changesets |
218 created new head |
216 created new head |
219 $ hg debugobsolete `getid 5` `getid 6` |
217 $ hg debugobsolete `getid 5` `getid 6` |
220 1 new obsolescence markers |
|
221 obsoleted 1 changesets |
218 obsoleted 1 changesets |
222 $ qlog |
219 $ qlog |
223 6 |
220 6 |
224 - 95de7fc6918d |
221 - 95de7fc6918d |
225 4 |
222 4 |
275 working directory parent is obsolete! (0d3f46688ccc) |
272 working directory parent is obsolete! (0d3f46688ccc) |
276 $ mkcommit "obsol_d'" # 7 |
273 $ mkcommit "obsol_d'" # 7 |
277 1 new orphan changesets |
274 1 new orphan changesets |
278 created new head |
275 created new head |
279 $ hg debugobsolete `getid 6` `getid 7` |
276 $ hg debugobsolete `getid 6` `getid 7` |
280 1 new obsolescence markers |
|
281 obsoleted 1 changesets |
277 obsoleted 1 changesets |
282 $ hg pull -R ../other-new . |
278 $ hg pull -R ../other-new . |
283 pulling from . |
279 pulling from . |
284 searching for changes |
280 searching for changes |
285 adding changesets |
281 adding changesets |
367 working directory parent is obsolete! (0d3f46688ccc) |
363 working directory parent is obsolete! (0d3f46688ccc) |
368 $ mkcommit "obsol_d''" |
364 $ mkcommit "obsol_d''" |
369 1 new orphan changesets |
365 1 new orphan changesets |
370 created new head |
366 created new head |
371 $ hg debugobsolete `getid 7` `getid 8` |
367 $ hg debugobsolete `getid 7` `getid 8` |
372 1 new obsolescence markers |
|
373 obsoleted 1 changesets |
368 obsoleted 1 changesets |
374 $ cd ../other-new |
369 $ cd ../other-new |
375 $ hg up -q 3 |
370 $ hg up -q 3 |
376 $ hg pull ../local/ |
371 $ hg pull ../local/ |
377 pulling from ../local/ |
372 pulling from ../local/ |
431 $ mkcommit toto # 9 |
426 $ mkcommit toto # 9 |
432 created new head |
427 created new head |
433 $ hg id -n |
428 $ hg id -n |
434 9 |
429 9 |
435 $ hg debugobsolete `getid 0` `getid 9` |
430 $ hg debugobsolete `getid 0` `getid 9` |
436 1 new obsolescence markers |
|
437 1 new phase-divergent changesets |
431 1 new phase-divergent changesets |
438 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 |
432 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 |
439 # at core level the warning is not issued |
433 # at core level the warning is not issued |
440 # this is now a big issue now that we have phase divergence warning |
434 # this is now a big issue now that we have phase divergence warning |
441 $ qlog -r 'obsolete()' |
435 $ qlog -r 'obsolete()' |
456 - 7c3bad9141dc |
450 - 7c3bad9141dc |
457 0 |
451 0 |
458 - 1f0dee641bb7 |
452 - 1f0dee641bb7 |
459 |
453 |
460 $ hg debugobsolete `getid 9` #kill |
454 $ hg debugobsolete `getid 9` #kill |
461 1 new obsolescence markers |
|
462 obsoleted 1 changesets |
455 obsoleted 1 changesets |
463 $ hg up null -q # to be not based on 9 anymore |
456 $ hg up null -q # to be not based on 9 anymore |
464 $ qlog |
457 $ qlog |
465 8 |
458 8 |
466 - 159dfc9fa5d3 |
459 - 159dfc9fa5d3 |
567 2 new content-divergent changesets |
560 2 new content-divergent changesets |
568 $ hg up -q 10 |
561 $ hg up -q 10 |
569 $ mkcommit "obsol_d'''" |
562 $ mkcommit "obsol_d'''" |
570 created new head |
563 created new head |
571 $ hg debugobsolete `getid 11` `getid 12` |
564 $ hg debugobsolete `getid 11` `getid 12` |
572 1 new obsolescence markers |
|
573 obsoleted 1 changesets |
565 obsoleted 1 changesets |
574 $ hg push ../other-new --traceback |
566 $ hg push ../other-new --traceback |
575 pushing to ../other-new |
567 pushing to ../other-new |
576 searching for changes |
568 searching for changes |
577 adding changesets |
569 adding changesets |
694 commit: (clean) |
686 commit: (clean) |
695 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
687 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
696 phases: 3 draft |
688 phases: 3 draft |
697 phase-divergent: 1 changesets |
689 phase-divergent: 1 changesets |
698 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
690 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
699 1 new obsolescence markers |
|
700 2 new content-divergent changesets |
691 2 new content-divergent changesets |
701 $ hg log -r 'contentdivergent()' |
692 $ hg log -r 'contentdivergent()' |
702 changeset: 12:6db5e282cb91 |
693 changeset: 12:6db5e282cb91 |
703 parent: 10:2033b4e49474 |
694 parent: 10:2033b4e49474 |
704 user: test |
695 user: test |