equal
deleted
inserted
replaced
63 - 1f0dee641bb7 |
63 - 1f0dee641bb7 |
64 $ qlog -r 'obsolete()' --hidden |
64 $ qlog -r 'obsolete()' --hidden |
65 2 |
65 2 |
66 - 4538525df7e2 |
66 - 4538525df7e2 |
67 |
67 |
68 Test that obsolete parent a properly computed |
68 Test that obsolete precursors are properly computed |
69 |
69 |
70 $ qlog -r 'precursors(.)' --hidden |
70 $ qlog -r 'precursors(.)' --hidden |
71 2 |
71 2 |
72 - 4538525df7e2 |
72 - 4538525df7e2 |
73 $ qlog -r . |
73 $ qlog -r . |
83 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
83 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
84 +++ b/obsol_c Thu Jan 01 00:00:00 1970 +0000 |
84 +++ b/obsol_c Thu Jan 01 00:00:00 1970 +0000 |
85 @@ -0,0 +1,1 @@ |
85 @@ -0,0 +1,1 @@ |
86 +obsol_c |
86 +obsol_c |
87 |
87 |
88 Test that obsolete successors a properly computed |
88 Test that obsolete successors are properly computed |
89 |
89 |
90 $ qlog -r 'successors(2)' --hidden |
90 $ qlog -r 'successors(2)' --hidden |
91 3 |
91 3 |
92 - 0d3f46688ccc |
92 - 0d3f46688ccc |
93 |
93 |
94 test obsolete changeset with no-obsolete descendant |
94 test obsolete changeset with non-obsolete descendant |
95 $ hg up 1 -q |
95 $ hg up 1 -q |
96 $ mkcommit "obsol_c'" # 4 (on 1) |
96 $ mkcommit "obsol_c'" # 4 (on 1) |
97 created new head |
97 created new head |
98 $ hg debugobsolete `getid 3` `getid 4` |
98 $ hg debugobsolete `getid 3` `getid 4` |
99 $ qlog |
99 $ qlog |
255 - 1f0dee641bb7 |
255 - 1f0dee641bb7 |
256 $ qlog -R ../other-new -r 'obsolete()' |
256 $ qlog -R ../other-new -r 'obsolete()' |
257 2 |
257 2 |
258 - 0d3f46688ccc |
258 - 0d3f46688ccc |
259 |
259 |
260 Pushing again does not advertise extinct changeset |
260 Pushing again does not advertise extinct changesets |
261 |
261 |
262 $ hg push ../other-new |
262 $ hg push ../other-new |
263 pushing to ../other-new |
263 pushing to ../other-new |
264 searching for changes |
264 searching for changes |
265 no changes found |
265 no changes found |
297 1 |
297 1 |
298 - 7c3bad9141dc |
298 - 7c3bad9141dc |
299 0 |
299 0 |
300 - 1f0dee641bb7 |
300 - 1f0dee641bb7 |
301 |
301 |
302 pushing to stuff that doesn't support obsolete |
302 pushing to stuff that doesn't support obsolescence |
303 |
303 |
304 DISABLED. the _enable switch it global :-/ |
304 DISABLED. the _enable switch is global :-/ |
305 |
305 |
306 .. $ hg init ../other-old |
306 .. $ hg init ../other-old |
307 .. > # XXX I don't like this but changeset get published otherwise |
307 .. > # XXX I don't like this but changeset get published otherwise |
308 .. > # remove it when we will get a --keep-state flag for push |
308 .. > # remove it when we will get a --keep-state flag for push |
309 .. $ echo '[extensions]' > ../other-old/.hg/hgrc |
309 .. $ echo '[extensions]' > ../other-old/.hg/hgrc |
462 1 |
462 1 |
463 - 7c3bad9141dc |
463 - 7c3bad9141dc |
464 0 |
464 0 |
465 - 1f0dee641bb7 |
465 - 1f0dee641bb7 |
466 |
466 |
467 Check that auto update ignore hidden changeset |
467 Check that auto update ignores hidden changeset |
468 $ hg up 0 |
468 $ hg up 0 |
469 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
469 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
470 $ hg up |
470 $ hg up |
471 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
471 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
472 $ hg id -n |
472 $ hg id -n |
473 8 |
473 8 |
474 |
474 |
475 Check that named update do too |
475 Check that named update does too |
476 |
476 |
477 $ hg update default |
477 $ hg update default |
478 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
478 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
479 $ hg id -n |
479 $ hg id -n |
480 8 |
480 8 |
515 o 1 - 7c3bad9141dc |
515 o 1 - 7c3bad9141dc |
516 | |
516 | |
517 o 0 - 1f0dee641bb7 |
517 o 0 - 1f0dee641bb7 |
518 |
518 |
519 |
519 |
520 should not rebase extinct changeset |
520 should not rebase extinct changesets |
521 |
521 |
522 #excluded 'whole rebase set is extinct and ignored.' message not in core |
522 #excluded 'whole rebase set is extinct and ignored.' message not in core |
523 $ hg rebase -b '3' -d 4 --traceback |
523 $ hg rebase -b '3' -d 4 --traceback |
524 2 new divergent changesets |
524 2 new divergent changesets |
525 $ hg up tip |
525 $ hg up tip |
535 | |
535 | |
536 o 0 - 1f0dee641bb7 add a |
536 o 0 - 1f0dee641bb7 add a |
537 |
537 |
538 |
538 |
539 Does not complain about new head if you obsolete the old one |
539 Does not complain about new head if you obsolete the old one |
540 (re necesarry when we start runnind discovery on unfiltered repo in core) |
540 (re necessary when we start running discovery on unfiltered repo in core) |
541 |
541 |
542 $ hg push ../other-new --traceback |
542 $ hg push ../other-new --traceback |
543 pushing to ../other-new |
543 pushing to ../other-new |
544 searching for changes |
544 searching for changes |
545 adding changesets |
545 adding changesets |