Show More
@@ -1766,6 +1766,7 b' def debugobsolete(ui, repo, precursor=No' | |||||
1766 | repo.obsstore.create(tr, prec, succs, opts['flags'], |
|
1766 | repo.obsstore.create(tr, prec, succs, opts['flags'], | |
1767 | parents=parents, date=date, |
|
1767 | parents=parents, date=date, | |
1768 | metadata=metadata, ui=ui) |
|
1768 | metadata=metadata, ui=ui) | |
|
1769 | repo.ui.status(('1 new obsolescence markers\n')) | |||
1769 | tr.close() |
|
1770 | tr.close() | |
1770 | except ValueError as exc: |
|
1771 | except ValueError as exc: | |
1771 | raise error.Abort(_('bad obsmarker input: %s') % |
|
1772 | raise error.Abort(_('bad obsmarker input: %s') % |
@@ -581,6 +581,7 b' tip is obsolete' | |||||
581 | --------------------- |
|
581 | --------------------- | |
582 |
|
582 | |||
583 | $ hg debugobsolete `hg id --debug -i -r tip` |
|
583 | $ hg debugobsolete `hg id --debug -i -r tip` | |
|
584 | 1 new obsolescence markers | |||
584 | obsoleted 1 changesets |
|
585 | obsoleted 1 changesets | |
585 | $ hg bisect --reset |
|
586 | $ hg bisect --reset | |
586 | $ hg bisect --good 15 |
|
587 | $ hg bisect --good 15 | |
@@ -609,6 +610,7 b' Rewritten commits should not crash' | |||||
609 | $ hg commit -m 'msg 30 -- fixed' |
|
610 | $ hg commit -m 'msg 30 -- fixed' | |
610 | created new head |
|
611 | created new head | |
611 | $ hg debugobsolete `hg id --debug -i -r 30` `hg id --debug -i -r .` |
|
612 | $ hg debugobsolete `hg id --debug -i -r 30` `hg id --debug -i -r .` | |
|
613 | 1 new obsolescence markers | |||
612 | obsoleted 1 changesets |
|
614 | obsoleted 1 changesets | |
613 | $ hg bisect |
|
615 | $ hg bisect | |
614 | The first bad revision is: |
|
616 | The first bad revision is: |
@@ -742,6 +742,7 b' diverging a remote bookmark fails' | |||||
742 | Unrelated marker does not alter the decision |
|
742 | Unrelated marker does not alter the decision | |
743 |
|
743 | |||
744 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
744 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
|
745 | 1 new obsolescence markers | |||
745 | $ hg push http://localhost:$HGPORT2/ |
|
746 | $ hg push http://localhost:$HGPORT2/ | |
746 | pushing to http://localhost:$HGPORT2/ |
|
747 | pushing to http://localhost:$HGPORT2/ | |
747 | searching for changes |
|
748 | searching for changes | |
@@ -763,8 +764,10 b' Update to a successor works' | |||||
763 | $ hg id --debug -r 5 |
|
764 | $ hg id --debug -r 5 | |
764 | c922c0139ca03858f655e4a2af4dd02796a63969 tip Y |
|
765 | c922c0139ca03858f655e4a2af4dd02796a63969 tip Y | |
765 | $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc |
|
766 | $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc | |
|
767 | 1 new obsolescence markers | |||
766 | obsoleted 1 changesets |
|
768 | obsoleted 1 changesets | |
767 | $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f |
|
769 | $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f | |
|
770 | 1 new obsolescence markers | |||
768 | $ hg push http://localhost:$HGPORT2/ |
|
771 | $ hg push http://localhost:$HGPORT2/ | |
769 | pushing to http://localhost:$HGPORT2/ |
|
772 | pushing to http://localhost:$HGPORT2/ | |
770 | searching for changes |
|
773 | searching for changes |
@@ -74,10 +74,12 b' Real world exchange' | |||||
74 | Add more obsolescence information |
|
74 | Add more obsolescence information | |
75 |
|
75 | |||
76 | $ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc` |
|
76 | $ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc` | |
|
77 | 1 new obsolescence markers | |||
77 | pre-close-tip:02de42196ebe draft |
|
78 | pre-close-tip:02de42196ebe draft | |
78 | postclose-tip:02de42196ebe draft |
|
79 | postclose-tip:02de42196ebe draft | |
79 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete |
|
80 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | |
80 | $ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c` |
|
81 | $ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c` | |
|
82 | 1 new obsolescence markers | |||
81 | pre-close-tip:02de42196ebe draft |
|
83 | pre-close-tip:02de42196ebe draft | |
82 | postclose-tip:02de42196ebe draft |
|
84 | postclose-tip:02de42196ebe draft | |
83 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete |
|
85 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | |
@@ -192,6 +194,7 b' add extra data to test their exchange du' | |||||
192 | postclose-tip:02de42196ebe draft |
|
194 | postclose-tip:02de42196ebe draft | |
193 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark |
|
195 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | |
194 | $ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a` |
|
196 | $ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a` | |
|
197 | 1 new obsolescence markers | |||
195 | pre-close-tip:02de42196ebe draft |
|
198 | pre-close-tip:02de42196ebe draft | |
196 | postclose-tip:02de42196ebe draft |
|
199 | postclose-tip:02de42196ebe draft | |
197 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete |
|
200 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | |
@@ -200,6 +203,7 b' add extra data to test their exchange du' | |||||
200 | postclose-tip:02de42196ebe draft book_02de |
|
203 | postclose-tip:02de42196ebe draft book_02de | |
201 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark |
|
204 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | |
202 | $ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe` |
|
205 | $ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe` | |
|
206 | 1 new obsolescence markers | |||
203 | pre-close-tip:02de42196ebe draft book_02de |
|
207 | pre-close-tip:02de42196ebe draft book_02de | |
204 | postclose-tip:02de42196ebe draft book_02de |
|
208 | postclose-tip:02de42196ebe draft book_02de | |
205 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete |
|
209 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | |
@@ -208,6 +212,7 b' add extra data to test their exchange du' | |||||
208 | postclose-tip:02de42196ebe draft book_02de |
|
212 | postclose-tip:02de42196ebe draft book_02de | |
209 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark |
|
213 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | |
210 | $ hg -R main debugobsolete -d '0 0' 5555555555555555555555555555555555555555 `getmainid 42ccdea3bb16` |
|
214 | $ hg -R main debugobsolete -d '0 0' 5555555555555555555555555555555555555555 `getmainid 42ccdea3bb16` | |
|
215 | 1 new obsolescence markers | |||
211 | pre-close-tip:02de42196ebe draft book_02de |
|
216 | pre-close-tip:02de42196ebe draft book_02de | |
212 | postclose-tip:02de42196ebe draft book_02de |
|
217 | postclose-tip:02de42196ebe draft book_02de | |
213 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete |
|
218 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | |
@@ -216,6 +221,7 b' add extra data to test their exchange du' | |||||
216 | postclose-tip:02de42196ebe draft book_02de |
|
221 | postclose-tip:02de42196ebe draft book_02de | |
217 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark |
|
222 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | |
218 | $ hg -R main debugobsolete -d '0 0' 6666666666666666666666666666666666666666 `getmainid 5fddd98957c8` |
|
223 | $ hg -R main debugobsolete -d '0 0' 6666666666666666666666666666666666666666 `getmainid 5fddd98957c8` | |
|
224 | 1 new obsolescence markers | |||
219 | pre-close-tip:02de42196ebe draft book_02de |
|
225 | pre-close-tip:02de42196ebe draft book_02de | |
220 | postclose-tip:02de42196ebe draft book_02de |
|
226 | postclose-tip:02de42196ebe draft book_02de | |
221 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete |
|
227 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | |
@@ -224,6 +230,7 b' add extra data to test their exchange du' | |||||
224 | postclose-tip:02de42196ebe draft book_02de |
|
230 | postclose-tip:02de42196ebe draft book_02de | |
225 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark |
|
231 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | |
226 | $ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403` |
|
232 | $ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403` | |
|
233 | 1 new obsolescence markers | |||
227 | pre-close-tip:02de42196ebe draft book_02de |
|
234 | pre-close-tip:02de42196ebe draft book_02de | |
228 | postclose-tip:02de42196ebe draft book_02de |
|
235 | postclose-tip:02de42196ebe draft book_02de | |
229 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete |
|
236 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete |
@@ -24,6 +24,7 b' Build a repo with some cacheable bits:' | |||||
24 | $ echo dumb > dumb |
|
24 | $ echo dumb > dumb | |
25 | $ hg ci -qAmdumb |
|
25 | $ hg ci -qAmdumb | |
26 | $ hg debugobsolete b1174d11b69e63cb0c5726621a43c859f0858d7f |
|
26 | $ hg debugobsolete b1174d11b69e63cb0c5726621a43c859f0858d7f | |
|
27 | 1 new obsolescence markers | |||
27 | obsoleted 1 changesets |
|
28 | obsoleted 1 changesets | |
28 |
|
29 | |||
29 | $ hg phase -pr t1 |
|
30 | $ hg phase -pr t1 |
@@ -537,6 +537,7 b' Clone non-publishing with obsolescence' | |||||
537 | $ echo foo > foo |
|
537 | $ echo foo > foo | |
538 | $ hg -q commit -m 'about to be pruned' |
|
538 | $ hg -q commit -m 'about to be pruned' | |
539 | $ hg debugobsolete `hg log -r . -T '{node}'` -d '0 0' -u test --record-parents |
|
539 | $ hg debugobsolete `hg log -r . -T '{node}'` -d '0 0' -u test --record-parents | |
|
540 | 1 new obsolescence markers | |||
540 | obsoleted 1 changesets |
|
541 | obsoleted 1 changesets | |
541 | $ hg up null -q |
|
542 | $ hg up null -q | |
542 | $ hg log -T '{rev}: {phase}\n' |
|
543 | $ hg log -T '{rev}: {phase}\n' |
@@ -759,6 +759,7 b' Create repositories to test auto sharing' | |||||
759 | $ echo initial2 > foo |
|
759 | $ echo initial2 > foo | |
760 | $ hg -q commit -A -m initial1 |
|
760 | $ hg -q commit -A -m initial1 | |
761 | $ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8 |
|
761 | $ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8 | |
|
762 | 1 new obsolescence markers | |||
762 | obsoleted 1 changesets |
|
763 | obsoleted 1 changesets | |
763 | $ cd .. |
|
764 | $ cd .. | |
764 |
|
765 |
@@ -549,6 +549,7 b' changelog and manifest would have invali' | |||||
549 | *** runcommand up null |
|
549 | *** runcommand up null | |
550 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
550 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
551 | *** runcommand phase -df tip |
|
551 | *** runcommand phase -df tip | |
|
552 | 1 new obsolescence markers | |||
552 | obsoleted 1 changesets |
|
553 | obsoleted 1 changesets | |
553 | *** runcommand log --hidden |
|
554 | *** runcommand log --hidden | |
554 | changeset: 1:731265503d86 |
|
555 | changeset: 1:731265503d86 |
@@ -53,6 +53,7 b' initial' | |||||
53 | $ cd main |
|
53 | $ cd main | |
54 | $ mkcommit A |
|
54 | $ mkcommit A | |
55 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` |
|
55 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` | |
|
56 | 1 new obsolescence markers | |||
56 | $ hg log -G |
|
57 | $ hg log -G | |
57 | @ f5bc6836db60 (draft): A |
|
58 | @ f5bc6836db60 (draft): A | |
58 | | |
|
59 | | | |
@@ -201,6 +202,7 b' initial' | |||||
201 | o a9bdc8b26820 (public): O |
|
202 | o a9bdc8b26820 (public): O | |
202 |
|
203 | |||
203 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` |
|
204 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` | |
|
205 | 1 new obsolescence markers | |||
204 | $ inspect_obsmarkers |
|
206 | $ inspect_obsmarkers | |
205 | obsstore content |
|
207 | obsstore content | |
206 | ================ |
|
208 | ================ |
@@ -56,11 +56,13 b' initial' | |||||
56 | $ cd main |
|
56 | $ cd main | |
57 | $ mkcommit A |
|
57 | $ mkcommit A | |
58 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` |
|
58 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` | |
|
59 | 1 new obsolescence markers | |||
59 | $ hg up '.~1' |
|
60 | $ hg up '.~1' | |
60 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
61 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
61 | $ mkcommit B |
|
62 | $ mkcommit B | |
62 | created new head |
|
63 | created new head | |
63 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B)'` |
|
64 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B)'` | |
|
65 | 1 new obsolescence markers | |||
64 | $ hg log -G |
|
66 | $ hg log -G | |
65 | @ 35b183996678 (draft): B |
|
67 | @ 35b183996678 (draft): B | |
66 | | |
|
68 | | |
@@ -73,9 +73,11 b' initial' | |||||
73 | $ mkcommit B1 |
|
73 | $ mkcommit B1 | |
74 | created new head |
|
74 | created new head | |
75 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
75 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
76 | 1 new obsolescence markers | |||
76 | obsoleted 1 changesets |
|
77 | obsoleted 1 changesets | |
77 | 1 new orphan changesets |
|
78 | 1 new orphan changesets | |
78 | $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` |
|
79 | $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` | |
|
80 | 1 new obsolescence markers | |||
79 | obsoleted 1 changesets |
|
81 | obsoleted 1 changesets | |
80 | $ hg log -G --hidden |
|
82 | $ hg log -G --hidden | |
81 | @ f6298a8ac3a4 (draft): B1 |
|
83 | @ f6298a8ac3a4 (draft): B1 | |
@@ -163,9 +165,11 b' other variant: changeset known in remote' | |||||
163 | $ mkcommit B1 |
|
165 | $ mkcommit B1 | |
164 | created new head |
|
166 | created new head | |
165 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
167 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
168 | 1 new obsolescence markers | |||
166 | obsoleted 1 changesets |
|
169 | obsoleted 1 changesets | |
167 | 1 new orphan changesets |
|
170 | 1 new orphan changesets | |
168 | $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` |
|
171 | $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` | |
|
172 | 1 new obsolescence markers | |||
169 | obsoleted 1 changesets |
|
173 | obsoleted 1 changesets | |
170 | $ hg log -G --hidden |
|
174 | $ hg log -G --hidden | |
171 | @ f6298a8ac3a4 (draft): B1 |
|
175 | @ f6298a8ac3a4 (draft): B1 |
@@ -63,7 +63,9 b' initial' | |||||
63 | $ mkcommit A1 |
|
63 | $ mkcommit A1 | |
64 | created new head |
|
64 | created new head | |
65 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` |
|
65 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` | |
|
66 | 1 new obsolescence markers | |||
66 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
67 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
68 | 1 new obsolescence markers | |||
67 | obsoleted 1 changesets |
|
69 | obsoleted 1 changesets | |
68 | 1 new orphan changesets |
|
70 | 1 new orphan changesets | |
69 | $ hg log -G --hidden |
|
71 | $ hg log -G --hidden |
@@ -65,9 +65,12 b' initial' | |||||
65 | created new head |
|
65 | created new head | |
66 | $ mkcommit A1 |
|
66 | $ mkcommit A1 | |
67 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` |
|
67 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` | |
|
68 | 1 new obsolescence markers | |||
68 | $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` |
|
69 | $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` | |
|
70 | 1 new obsolescence markers | |||
69 | obsoleted 1 changesets |
|
71 | obsoleted 1 changesets | |
70 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
72 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
73 | 1 new obsolescence markers | |||
71 | obsoleted 1 changesets |
|
74 | obsoleted 1 changesets | |
72 | $ hg log -G --hidden |
|
75 | $ hg log -G --hidden | |
73 | @ 8c0a98c83722 (draft): A1 |
|
76 | @ 8c0a98c83722 (draft): A1 |
@@ -64,6 +64,7 b' make both changeset known in remote' | |||||
64 | create a marker after this |
|
64 | create a marker after this | |
65 |
|
65 | |||
66 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
66 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
67 | 1 new obsolescence markers | |||
67 | obsoleted 1 changesets |
|
68 | obsoleted 1 changesets | |
68 | $ hg log -G --hidden |
|
69 | $ hg log -G --hidden | |
69 | @ e5ea8f9c7314 (draft): A1 |
|
70 | @ e5ea8f9c7314 (draft): A1 |
@@ -51,6 +51,7 b' Initial' | |||||
51 | $ hg push -q ../pushdest |
|
51 | $ hg push -q ../pushdest | |
52 | $ hg push -q ../pulldest |
|
52 | $ hg push -q ../pulldest | |
53 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` |
|
53 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` | |
|
54 | 1 new obsolescence markers | |||
54 | $ hg log -G --hidden |
|
55 | $ hg log -G --hidden | |
55 | @ f5bc6836db60 (draft): A |
|
56 | @ f5bc6836db60 (draft): A | |
56 | | |
|
57 | | |
@@ -70,10 +70,13 b' initial' | |||||
70 | created new head |
|
70 | created new head | |
71 | $ mkcommit B1 |
|
71 | $ mkcommit B1 | |
72 | $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
72 | $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
73 | 1 new obsolescence markers | |||
73 | obsoleted 1 changesets |
|
74 | obsoleted 1 changesets | |
74 | 2 new orphan changesets |
|
75 | 2 new orphan changesets | |
75 | $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` |
|
76 | $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` | |
|
77 | 1 new obsolescence markers | |||
76 | $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` |
|
78 | $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` | |
|
79 | 1 new obsolescence markers | |||
77 | obsoleted 1 changesets |
|
80 | obsoleted 1 changesets | |
78 | $ hg prune -qd '0 0' 'desc(B1)' |
|
81 | $ hg prune -qd '0 0' 'desc(B1)' | |
79 | $ hg log -G --hidden |
|
82 | $ hg log -G --hidden |
@@ -57,6 +57,7 b' Initial' | |||||
57 | $ mkcommit B1 |
|
57 | $ mkcommit B1 | |
58 | created new head |
|
58 | created new head | |
59 | $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` |
|
59 | $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` | |
|
60 | 1 new obsolescence markers | |||
60 | obsoleted 1 changesets |
|
61 | obsoleted 1 changesets | |
61 | $ hg prune -qd '0 0' . |
|
62 | $ hg prune -qd '0 0' . | |
62 | $ hg log -G --hidden |
|
63 | $ hg log -G --hidden |
@@ -62,6 +62,7 b' Itinial' | |||||
62 | $ mkcommit A1 |
|
62 | $ mkcommit A1 | |
63 | created new head |
|
63 | created new head | |
64 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
64 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
65 | 1 new obsolescence markers | |||
65 | obsoleted 1 changesets |
|
66 | obsoleted 1 changesets | |
66 | $ hg log -G --hidden |
|
67 | $ hg log -G --hidden | |
67 | @ e5ea8f9c7314 (draft): A1 |
|
68 | @ e5ea8f9c7314 (draft): A1 |
@@ -64,6 +64,7 b' Initial' | |||||
64 | $ mkcommit A1 |
|
64 | $ mkcommit A1 | |
65 | created new head |
|
65 | created new head | |
66 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
66 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
67 | 1 new obsolescence markers | |||
67 | obsoleted 1 changesets |
|
68 | obsoleted 1 changesets | |
68 | $ hg prune -qd '0 0' . |
|
69 | $ hg prune -qd '0 0' . | |
69 | $ hg log -G --hidden |
|
70 | $ hg log -G --hidden |
@@ -65,8 +65,10 b' Implemented as the non-split version' | |||||
65 | $ mkcommit C |
|
65 | $ mkcommit C | |
66 | created new head |
|
66 | created new head | |
67 | $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` |
|
67 | $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` | |
|
68 | 1 new obsolescence markers | |||
68 | obsoleted 1 changesets |
|
69 | obsoleted 1 changesets | |
69 | $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` |
|
70 | $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` | |
|
71 | 1 new obsolescence markers | |||
70 | 2 new content-divergent changesets |
|
72 | 2 new content-divergent changesets | |
71 | $ hg prune -qd '0 0' . |
|
73 | $ hg prune -qd '0 0' . | |
72 | $ hg log -G --hidden |
|
74 | $ hg log -G --hidden |
@@ -61,9 +61,11 b' initial' | |||||
61 | $ mkcommit A1 |
|
61 | $ mkcommit A1 | |
62 | created new head |
|
62 | created new head | |
63 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
63 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
64 | 1 new obsolescence markers | |||
64 | obsoleted 1 changesets |
|
65 | obsoleted 1 changesets | |
65 | 1 new orphan changesets |
|
66 | 1 new orphan changesets | |
66 | $ hg prune -d '0 0' 'desc(B)' |
|
67 | $ hg prune -d '0 0' 'desc(B)' | |
|
68 | 1 new obsolescence markers | |||
67 | obsoleted 1 changesets |
|
69 | obsoleted 1 changesets | |
68 | $ hg strip --hidden -q 'desc(A0)' |
|
70 | $ hg strip --hidden -q 'desc(A0)' | |
69 | $ hg log -G --hidden |
|
71 | $ hg log -G --hidden |
@@ -54,8 +54,10 b' Initial' | |||||
54 | $ mkcommit A1 |
|
54 | $ mkcommit A1 | |
55 | created new head |
|
55 | created new head | |
56 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
56 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
57 | 1 new obsolescence markers | |||
57 | obsoleted 1 changesets |
|
58 | obsoleted 1 changesets | |
58 | $ hg prune --date '0 0' . |
|
59 | $ hg prune --date '0 0' . | |
|
60 | 1 new obsolescence markers | |||
59 | obsoleted 1 changesets |
|
61 | obsoleted 1 changesets | |
60 | $ hg strip --hidden -q 'desc(A1)' |
|
62 | $ hg strip --hidden -q 'desc(A1)' | |
61 | $ hg log -G --hidden |
|
63 | $ hg log -G --hidden |
@@ -57,8 +57,10 b' initial' | |||||
57 | created new head |
|
57 | created new head | |
58 | $ mkcommit A1 |
|
58 | $ mkcommit A1 | |
59 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
59 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
|
60 | 1 new obsolescence markers | |||
60 | obsoleted 1 changesets |
|
61 | obsoleted 1 changesets | |
61 | $ hg prune -d '0 0' . |
|
62 | $ hg prune -d '0 0' . | |
|
63 | 1 new obsolescence markers | |||
62 | obsoleted 1 changesets |
|
64 | obsoleted 1 changesets | |
63 | $ hg strip --hidden -q 'desc(A1)' |
|
65 | $ hg strip --hidden -q 'desc(A1)' | |
64 | $ hg log -G --hidden |
|
66 | $ hg log -G --hidden |
@@ -59,12 +59,16 b' initial' | |||||
59 | created new head |
|
59 | created new head | |
60 | $ mkcommit B1 |
|
60 | $ mkcommit B1 | |
61 | $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
|
61 | $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | |
|
62 | 1 new obsolescence markers | |||
62 | obsoleted 1 changesets |
|
63 | obsoleted 1 changesets | |
63 | 1 new orphan changesets |
|
64 | 1 new orphan changesets | |
64 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'` |
|
65 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'` | |
|
66 | 1 new obsolescence markers | |||
65 | $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
67 | $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
|
68 | 1 new obsolescence markers | |||
66 | obsoleted 1 changesets |
|
69 | obsoleted 1 changesets | |
67 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'` |
|
70 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'` | |
|
71 | 1 new obsolescence markers | |||
68 | $ hg log -G --hidden |
|
72 | $ hg log -G --hidden | |
69 | @ 069b05c3876d (draft): B1 |
|
73 | @ 069b05c3876d (draft): B1 | |
70 | | |
|
74 | | |
@@ -1103,6 +1103,7 b' obsolete revision.' | |||||
1103 | $ printf "foo\n" > foo.changed |
|
1103 | $ printf "foo\n" > foo.changed | |
1104 | $ hg commit -Aqm "foo" |
|
1104 | $ hg commit -Aqm "foo" | |
1105 | $ hg debugobsolete `hg parents --template '{node}'` |
|
1105 | $ hg debugobsolete `hg parents --template '{node}'` | |
|
1106 | 1 new obsolescence markers | |||
1106 | obsoleted 1 changesets |
|
1107 | obsoleted 1 changesets | |
1107 | $ hg --hidden fix -r 0 |
|
1108 | $ hg --hidden fix -r 0 | |
1108 | abort: fixing obsolete revision could cause divergence |
|
1109 | abort: fixing obsolete revision could cause divergence |
@@ -2426,6 +2426,7 b' Test --hidden' | |||||
2426 | > EOF |
|
2426 | > EOF | |
2427 |
|
2427 | |||
2428 | $ hg debugobsolete `hg id --debug -i -r 8` |
|
2428 | $ hg debugobsolete `hg id --debug -i -r 8` | |
|
2429 | 1 new obsolescence markers | |||
2429 | obsoleted 1 changesets |
|
2430 | obsoleted 1 changesets | |
2430 | $ testlog |
|
2431 | $ testlog | |
2431 | [] |
|
2432 | [] |
@@ -2276,6 +2276,7 b' Test --hidden' | |||||
2276 | > EOF |
|
2276 | > EOF | |
2277 |
|
2277 | |||
2278 | $ hg debugobsolete `hg id --debug -i -r 8` |
|
2278 | $ hg debugobsolete `hg id --debug -i -r 8` | |
|
2279 | 1 new obsolescence markers | |||
2279 | obsoleted 1 changesets |
|
2280 | obsoleted 1 changesets | |
2280 | $ testlog |
|
2281 | $ testlog | |
2281 | [] |
|
2282 | [] |
@@ -332,6 +332,7 b' process.' | |||||
332 | > evolution.createmarkers=True |
|
332 | > evolution.createmarkers=True | |
333 | > EOF |
|
333 | > EOF | |
334 | $ hg debugobsolete `hg log -r tip -T "{node}"` |
|
334 | $ hg debugobsolete `hg log -r tip -T "{node}"` | |
|
335 | 1 new obsolescence markers | |||
335 | obsoleted 1 changesets |
|
336 | obsoleted 1 changesets | |
336 | $ cd .. |
|
337 | $ cd .. | |
337 |
|
338 |
@@ -1941,6 +1941,7 b' enable obsolete to test hidden feature' | |||||
1941 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1941 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1942 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1942 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1943 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
|
1943 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f | |
|
1944 | 1 new obsolescence markers | |||
1944 | obsoleted 1 changesets |
|
1945 | obsoleted 1 changesets | |
1945 | $ hg up null -q |
|
1946 | $ hg up null -q | |
1946 | $ hg log --template='{rev}:{node}\n' |
|
1947 | $ hg log --template='{rev}:{node}\n' | |
@@ -1995,6 +1996,7 b' test hidden revision 0 (issue5385)' | |||||
1995 | $ hg bookmark -d X@foo |
|
1996 | $ hg bookmark -d X@foo | |
1996 | $ hg up null -q |
|
1997 | $ hg up null -q | |
1997 | $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1998 | $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
|
1999 | 1 new obsolescence markers | |||
1998 | obsoleted 1 changesets |
|
2000 | obsoleted 1 changesets | |
1999 | $ echo f > b |
|
2001 | $ echo f > b | |
2000 | $ hg ci -Am'b' -d '2 0' |
|
2002 | $ hg ci -Am'b' -d '2 0' | |
@@ -2470,6 +2472,7 b' Test that we use the first non-hidden ch' | |||||
2470 | $ hg log -T '{node}\n' -r 1 |
|
2472 | $ hg log -T '{node}\n' -r 1 | |
2471 | 2294ae80ad8447bc78383182eeac50cb049df623 |
|
2473 | 2294ae80ad8447bc78383182eeac50cb049df623 | |
2472 | $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 |
|
2474 | $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 | |
|
2475 | 1 new obsolescence markers | |||
2473 | obsoleted 1 changesets |
|
2476 | obsoleted 1 changesets | |
2474 | $ hg log -G |
|
2477 | $ hg log -G | |
2475 | o changeset: 4:50b9b36e9c5d |
|
2478 | o changeset: 4:50b9b36e9c5d | |
@@ -2520,6 +2523,7 b' Even when a head revision is linkrev-sha' | |||||
2520 | $ hg log -T '{node}\n' -r 4 |
|
2523 | $ hg log -T '{node}\n' -r 4 | |
2521 | 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
|
2524 | 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 | |
2522 | $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
|
2525 | $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 | |
|
2526 | 1 new obsolescence markers | |||
2523 | obsoleted 1 changesets |
|
2527 | obsoleted 1 changesets | |
2524 | $ hg log -G a |
|
2528 | $ hg log -G a | |
2525 | @ changeset: 3:15b2327059e5 |
|
2529 | @ changeset: 3:15b2327059e5 |
@@ -157,6 +157,7 b' Pruned commits affecting removed paths s' | |||||
157 | $ hg co '.^' |
|
157 | $ hg co '.^' | |
158 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
158 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
159 | $ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'` |
|
159 | $ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'` | |
|
160 | 1 new obsolescence markers | |||
160 | obsoleted 1 changesets |
|
161 | obsoleted 1 changesets | |
161 | $ hg tracked --removeinclude d0 |
|
162 | $ hg tracked --removeinclude d0 | |
162 | comparing with ssh://user@dummy/master |
|
163 | comparing with ssh://user@dummy/master |
@@ -88,6 +88,7 b' Test setup' | |||||
88 | summary: ROOT |
|
88 | summary: ROOT | |
89 |
|
89 | |||
90 | $ hg debugobsolete --record-parents `getid 'desc(B0)'` |
|
90 | $ hg debugobsolete --record-parents `getid 'desc(B0)'` | |
|
91 | 1 new obsolescence markers | |||
91 | obsoleted 1 changesets |
|
92 | obsoleted 1 changesets | |
92 |
|
93 | |||
93 | $ hg log --hidden -G |
|
94 | $ hg log --hidden -G | |
@@ -162,6 +163,7 b' Test setup' | |||||
162 | adding b |
|
163 | adding b | |
163 |
|
164 | |||
164 | $ hg debugobsolete `getid '1'` `getid '2'` `getid '3'` |
|
165 | $ hg debugobsolete `getid '1'` `getid '2'` `getid '3'` | |
|
166 | 1 new obsolescence markers | |||
165 | obsoleted 1 changesets |
|
167 | obsoleted 1 changesets | |
166 |
|
168 | |||
167 | $ hg log --hidden -G |
|
169 | $ hg log --hidden -G | |
@@ -251,6 +253,7 b' Test setup' | |||||
251 | adding d |
|
253 | adding d | |
252 |
|
254 | |||
253 | $ hg debugobsolete `getid '1'` `getid '2'` `getid '3'` `getid '4'` `getid '5'` |
|
255 | $ hg debugobsolete `getid '1'` `getid '2'` `getid '3'` `getid '4'` `getid '5'` | |
|
256 | 1 new obsolescence markers | |||
254 | obsoleted 1 changesets |
|
257 | obsoleted 1 changesets | |
255 |
|
258 | |||
256 | $ hg log --hidden -G |
|
259 | $ hg log --hidden -G | |
@@ -336,9 +339,11 b' Test setup' | |||||
336 | created new head |
|
339 | created new head | |
337 |
|
340 | |||
338 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'` |
|
341 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'` | |
|
342 | 1 new obsolescence markers | |||
339 | obsoleted 1 changesets |
|
343 | obsoleted 1 changesets | |
340 | 1 new orphan changesets |
|
344 | 1 new orphan changesets | |
341 | $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(C0)'` |
|
345 | $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(C0)'` | |
|
346 | 1 new obsolescence markers | |||
342 | obsoleted 1 changesets |
|
347 | obsoleted 1 changesets | |
343 |
|
348 | |||
344 | $ hg log --hidden -G |
|
349 | $ hg log --hidden -G | |
@@ -507,9 +512,11 b' Test setup' | |||||
507 | created new head |
|
512 | created new head | |
508 |
|
513 | |||
509 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'` |
|
514 | $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'` | |
|
515 | 1 new obsolescence markers | |||
510 | obsoleted 1 changesets |
|
516 | obsoleted 1 changesets | |
511 | 1 new orphan changesets |
|
517 | 1 new orphan changesets | |
512 | $ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'` |
|
518 | $ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'` | |
|
519 | 1 new obsolescence markers | |||
513 | obsoleted 1 changesets |
|
520 | obsoleted 1 changesets | |
514 |
|
521 | |||
515 | $ hg log --hidden -G |
|
522 | $ hg log --hidden -G |
@@ -387,6 +387,7 b' Test templates with splitted commit' | |||||
387 | $ hg commit -A -m "A0" |
|
387 | $ hg commit -A -m "A0" | |
388 | adding b |
|
388 | adding b | |
389 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
|
389 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` | |
|
390 | 1 new obsolescence markers | |||
390 | obsoleted 1 changesets |
|
391 | obsoleted 1 changesets | |
391 |
|
392 | |||
392 | $ hg log --hidden -G |
|
393 | $ hg log --hidden -G | |
@@ -593,9 +594,11 b' Simulate a fold' | |||||
593 | adding B0 |
|
594 | adding B0 | |
594 | created new head |
|
595 | created new head | |
595 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
|
596 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` | |
|
597 | 1 new obsolescence markers | |||
596 | obsoleted 1 changesets |
|
598 | obsoleted 1 changesets | |
597 | 1 new orphan changesets |
|
599 | 1 new orphan changesets | |
598 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
600 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` | |
|
601 | 1 new obsolescence markers | |||
599 | obsoleted 1 changesets |
|
602 | obsoleted 1 changesets | |
600 |
|
603 | |||
601 | $ hg log --hidden -G |
|
604 | $ hg log --hidden -G | |
@@ -1120,9 +1123,11 b' Test setup' | |||||
1120 | adding B0 |
|
1123 | adding B0 | |
1121 | created new head |
|
1124 | created new head | |
1122 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
|
1125 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` | |
|
1126 | 1 new obsolescence markers | |||
1123 | obsoleted 1 changesets |
|
1127 | obsoleted 1 changesets | |
1124 | 1 new orphan changesets |
|
1128 | 1 new orphan changesets | |
1125 | $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
|
1129 | $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` | |
|
1130 | 1 new obsolescence markers | |||
1126 | obsoleted 1 changesets |
|
1131 | obsoleted 1 changesets | |
1127 |
|
1132 | |||
1128 | $ hg log --hidden -G |
|
1133 | $ hg log --hidden -G | |
@@ -1601,11 +1606,14 b' Test setup' | |||||
1601 | Create the cycle |
|
1606 | Create the cycle | |
1602 |
|
1607 | |||
1603 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
|
1608 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` | |
|
1609 | 1 new obsolescence markers | |||
1604 | obsoleted 1 changesets |
|
1610 | obsoleted 1 changesets | |
1605 | 1 new orphan changesets |
|
1611 | 1 new orphan changesets | |
1606 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
1612 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` | |
|
1613 | 1 new obsolescence markers | |||
1607 | obsoleted 1 changesets |
|
1614 | obsoleted 1 changesets | |
1608 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
|
1615 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` | |
|
1616 | 1 new obsolescence markers | |||
1609 |
|
1617 | |||
1610 | Check templates |
|
1618 | Check templates | |
1611 | --------------- |
|
1619 | --------------- | |
@@ -1854,6 +1862,7 b' Split it' | |||||
1854 | summary: ROOT |
|
1862 | summary: ROOT | |
1855 |
|
1863 | |||
1856 | $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
|
1864 | $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` | |
|
1865 | 1 new obsolescence markers | |||
1857 | obsoleted 1 changesets |
|
1866 | obsoleted 1 changesets | |
1858 | $ hg log -G |
|
1867 | $ hg log -G | |
1859 | @ changeset: 7:ba2ed02b0c9a |
|
1868 | @ changeset: 7:ba2ed02b0c9a | |
@@ -2301,6 +2310,7 b' Test setup' | |||||
2301 | $ mkcommit ROOT |
|
2310 | $ mkcommit ROOT | |
2302 | $ mkcommit A0 |
|
2311 | $ mkcommit A0 | |
2303 | $ hg debugobsolete --record-parent `getid "."` |
|
2312 | $ hg debugobsolete --record-parent `getid "."` | |
|
2313 | 1 new obsolescence markers | |||
2304 | obsoleted 1 changesets |
|
2314 | obsoleted 1 changesets | |
2305 |
|
2315 | |||
2306 | Check output |
|
2316 | Check output | |
@@ -2330,6 +2340,7 b' Test setup' | |||||
2330 | $ mkcommit A0 |
|
2340 | $ mkcommit A0 | |
2331 | $ hg commit --amend -m "A1" |
|
2341 | $ hg commit --amend -m "A1" | |
2332 | $ hg debugobsolete --record-parent `getid "."` |
|
2342 | $ hg debugobsolete --record-parent `getid "."` | |
|
2343 | 1 new obsolescence markers | |||
2333 | obsoleted 1 changesets |
|
2344 | obsoleted 1 changesets | |
2334 |
|
2345 | |||
2335 | $ hg up -r "desc(A0)" --hidden |
|
2346 | $ hg up -r "desc(A0)" --hidden | |
@@ -2338,6 +2349,7 b' Test setup' | |||||
2338 | (hidden revision '471f378eab4c' is pruned) |
|
2349 | (hidden revision '471f378eab4c' is pruned) | |
2339 | $ hg commit --amend -m "A2" |
|
2350 | $ hg commit --amend -m "A2" | |
2340 | $ hg debugobsolete --record-parent `getid "."` |
|
2351 | $ hg debugobsolete --record-parent `getid "."` | |
|
2352 | 1 new obsolescence markers | |||
2341 | obsoleted 1 changesets |
|
2353 | obsoleted 1 changesets | |
2342 |
|
2354 | |||
2343 | Check output |
|
2355 | Check output | |
@@ -2481,10 +2493,12 b' Test templates with splitted and pruned ' | |||||
2481 | $ hg commit -A -m "A2" |
|
2493 | $ hg commit -A -m "A2" | |
2482 | adding b |
|
2494 | adding b | |
2483 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
|
2495 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` | |
|
2496 | 1 new obsolescence markers | |||
2484 | obsoleted 1 changesets |
|
2497 | obsoleted 1 changesets | |
2485 |
|
2498 | |||
2486 | # Simulate prune |
|
2499 | # Simulate prune | |
2487 | $ hg debugobsolete --record-parent `getid "."` |
|
2500 | $ hg debugobsolete --record-parent `getid "."` | |
|
2501 | 1 new obsolescence markers | |||
2488 | obsoleted 1 changesets |
|
2502 | obsoleted 1 changesets | |
2489 |
|
2503 | |||
2490 | $ hg log --hidden -G |
|
2504 | $ hg log --hidden -G | |
@@ -2622,6 +2636,7 b' Test metadata encoding (issue5754)' | |||||
2622 | > --config devel.user.obsmarker="`cat test2`" |
|
2636 | > --config devel.user.obsmarker="`cat test2`" | |
2623 | $ mkcommit B0 |
|
2637 | $ mkcommit B0 | |
2624 | $ HGENCODING=latin-1 hg debugobsolete -u "`cat test2`" "`getid 'desc(B0)'`" |
|
2638 | $ HGENCODING=latin-1 hg debugobsolete -u "`cat test2`" "`getid 'desc(B0)'`" | |
|
2639 | 1 new obsolescence markers | |||
2625 | obsoleted 1 changesets |
|
2640 | obsoleted 1 changesets | |
2626 |
|
2641 | |||
2627 | metadata should be stored in UTF-8, and debugobsolete doesn't decode it to |
|
2642 | metadata should be stored in UTF-8, and debugobsolete doesn't decode it to |
@@ -126,9 +126,12 b' setup' | |||||
126 | $ mkcommit 'C-A1' |
|
126 | $ mkcommit 'C-A1' | |
127 | created new head |
|
127 | created new head | |
128 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
128 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
|
129 | 1 new obsolescence markers | |||
129 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
|
130 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 | |
|
131 | 1 new obsolescence markers | |||
130 | obsoleted 1 changesets |
|
132 | obsoleted 1 changesets | |
131 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` |
|
133 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` | |
|
134 | 1 new obsolescence markers | |||
132 |
|
135 | |||
133 | $ hg up 'desc("ROOT")' |
|
136 | $ hg up 'desc("ROOT")' | |
134 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
137 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
@@ -272,10 +275,13 b' setup' | |||||
272 | $ mkcommit 'C-A1' |
|
275 | $ mkcommit 'C-A1' | |
273 | created new head |
|
276 | created new head | |
274 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
277 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
|
278 | 1 new obsolescence markers | |||
275 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
279 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
|
280 | 1 new obsolescence markers | |||
276 | obsoleted 1 changesets |
|
281 | obsoleted 1 changesets | |
277 | 1 new orphan changesets |
|
282 | 1 new orphan changesets | |
278 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
283 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
|
284 | 1 new obsolescence markers | |||
279 | obsoleted 1 changesets |
|
285 | obsoleted 1 changesets | |
280 | $ hg up 'desc("ROOT")' |
|
286 | $ hg up 'desc("ROOT")' | |
281 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
287 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
@@ -461,9 +467,12 b' setup' | |||||
461 | $ mkcommit 'C-A1' |
|
467 | $ mkcommit 'C-A1' | |
462 | created new head |
|
468 | created new head | |
463 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
469 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
|
470 | 1 new obsolescence markers | |||
464 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
471 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
|
472 | 1 new obsolescence markers | |||
465 | obsoleted 1 changesets |
|
473 | obsoleted 1 changesets | |
466 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
474 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
|
475 | 1 new obsolescence markers | |||
467 | $ hg up 'desc("ROOT")' |
|
476 | $ hg up 'desc("ROOT")' | |
468 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
477 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
469 | $ hg log --hidden -G |
|
478 | $ hg log --hidden -G | |
@@ -606,10 +615,13 b' setup' | |||||
606 | $ mkcommit 'C-A1' |
|
615 | $ mkcommit 'C-A1' | |
607 | created new head |
|
616 | created new head | |
608 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
617 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
|
618 | 1 new obsolescence markers | |||
609 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
619 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
|
620 | 1 new obsolescence markers | |||
610 | obsoleted 1 changesets |
|
621 | obsoleted 1 changesets | |
611 | 1 new orphan changesets |
|
622 | 1 new orphan changesets | |
612 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
623 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
|
624 | 1 new obsolescence markers | |||
613 | obsoleted 1 changesets |
|
625 | obsoleted 1 changesets | |
614 |
|
626 | |||
615 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
627 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
@@ -688,9 +700,12 b' setup' | |||||
688 | $ mkcommit 'C-A1' |
|
700 | $ mkcommit 'C-A1' | |
689 | created new head |
|
701 | created new head | |
690 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
702 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
|
703 | 1 new obsolescence markers | |||
691 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
704 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
|
705 | 1 new obsolescence markers | |||
692 | obsoleted 1 changesets |
|
706 | obsoleted 1 changesets | |
693 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
707 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
|
708 | 1 new obsolescence markers | |||
694 |
|
709 | |||
695 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
710 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
696 |
|
711 | |||
@@ -775,20 +790,29 b' setup' | |||||
775 | $ mkcommit 'C-E' |
|
790 | $ mkcommit 'C-E' | |
776 | created new head |
|
791 | created new head | |
777 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` |
|
792 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` | |
|
793 | 1 new obsolescence markers | |||
778 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
|
794 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split | |
|
795 | 1 new obsolescence markers | |||
779 | obsoleted 1 changesets |
|
796 | obsoleted 1 changesets | |
780 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
|
797 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent | |
|
798 | 1 new obsolescence markers | |||
781 | 3 new content-divergent changesets |
|
799 | 3 new content-divergent changesets | |
782 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
|
800 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 | |
|
801 | 1 new obsolescence markers | |||
783 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
|
802 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` | |
|
803 | 1 new obsolescence markers | |||
784 | 1 new content-divergent changesets |
|
804 | 1 new content-divergent changesets | |
785 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` |
|
805 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` | |
|
806 | 1 new obsolescence markers | |||
786 | obsoleted 1 changesets |
|
807 | obsoleted 1 changesets | |
787 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` |
|
808 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` | |
|
809 | 1 new obsolescence markers | |||
788 | obsoleted 1 changesets |
|
810 | obsoleted 1 changesets | |
789 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` |
|
811 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` | |
|
812 | 1 new obsolescence markers | |||
790 | obsoleted 1 changesets |
|
813 | obsoleted 1 changesets | |
791 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` |
|
814 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` | |
|
815 | 1 new obsolescence markers | |||
792 |
|
816 | |||
793 | $ hg up 'desc("ROOT")' |
|
817 | $ hg up 'desc("ROOT")' | |
794 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
818 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
@@ -1334,6 +1358,7 b' setup' | |||||
1334 | $ mkcommit 'C-A' |
|
1358 | $ mkcommit 'C-A' | |
1335 | $ mkcommit 'C-B' |
|
1359 | $ mkcommit 'C-B' | |
1336 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
|
1360 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` | |
|
1361 | 1 new obsolescence markers | |||
1337 | obsoleted 1 changesets |
|
1362 | obsoleted 1 changesets | |
1338 |
|
1363 | |||
1339 | $ hg up 'desc("ROOT")' |
|
1364 | $ hg up 'desc("ROOT")' |
@@ -34,6 +34,7 b' extinct changeset.' | |||||
34 | o base d20a80d4def38df63a4b330b7fb688f3d4cae1e3 |
|
34 | o base d20a80d4def38df63a4b330b7fb688f3d4cae1e3 | |
35 |
|
35 | |||
36 | $ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
|
36 | $ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee | |
|
37 | 1 new obsolescence markers | |||
37 | obsoleted 1 changesets |
|
38 | obsoleted 1 changesets | |
38 |
|
39 | |||
39 | Push it. The bundle should not refer to the extinct changeset. |
|
40 | Push it. The bundle should not refer to the extinct changeset. | |
@@ -139,6 +140,7 b' server obsoletes the old head' | |||||
139 | $ echo 2b > foo |
|
140 | $ echo 2b > foo | |
140 | $ hg -q commit -m 2b |
|
141 | $ hg -q commit -m 2b | |
141 | $ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129 |
|
142 | $ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129 | |
|
143 | 1 new obsolescence markers | |||
142 | obsoleted 1 changesets |
|
144 | obsoleted 1 changesets | |
143 | $ cd .. |
|
145 | $ cd .. | |
144 |
|
146 |
@@ -47,6 +47,7 b' setup' | |||||
47 | $ mkcommit new |
|
47 | $ mkcommit new | |
48 | created new head |
|
48 | created new head | |
49 | $ hg debugobsolete --flags 1 `getid old` `getid new` |
|
49 | $ hg debugobsolete --flags 1 `getid old` `getid new` | |
|
50 | 1 new obsolescence markers | |||
50 | obsoleted 1 changesets |
|
51 | obsoleted 1 changesets | |
51 | $ hg log -G --hidden |
|
52 | $ hg log -G --hidden | |
52 | @ 71e3228bffe1 (draft) add new |
|
53 | @ 71e3228bffe1 (draft) add new | |
@@ -190,6 +191,7 b' setup. (The obsolete marker is known loc' | |||||
190 | $ mkcommit desc2 |
|
191 | $ mkcommit desc2 | |
191 | created new head |
|
192 | created new head | |
192 | $ hg debugobsolete `getid old` `getid new` |
|
193 | $ hg debugobsolete `getid old` `getid new` | |
|
194 | 1 new obsolescence markers | |||
193 | obsoleted 1 changesets |
|
195 | obsoleted 1 changesets | |
194 | $ hg log -G --hidden |
|
196 | $ hg log -G --hidden | |
195 | @ 5fe37041cc2b (draft) add desc2 |
|
197 | @ 5fe37041cc2b (draft) add desc2 | |
@@ -247,6 +249,7 b' setup' | |||||
247 | $ hg id --debug -r tip |
|
249 | $ hg id --debug -r tip | |
248 | 71e3228bffe1886550777233d6c97bb5a6b2a650 tip |
|
250 | 71e3228bffe1886550777233d6c97bb5a6b2a650 tip | |
249 | $ hg debugobsolete c70b08862e0838ea6d7c59c85da2f1ed6c8d67da 71e3228bffe1886550777233d6c97bb5a6b2a650 |
|
251 | $ hg debugobsolete c70b08862e0838ea6d7c59c85da2f1ed6c8d67da 71e3228bffe1886550777233d6c97bb5a6b2a650 | |
|
252 | 1 new obsolescence markers | |||
250 | $ hg log -G --hidden |
|
253 | $ hg log -G --hidden | |
251 | @ 71e3228bffe1 (draft) add new |
|
254 | @ 71e3228bffe1 (draft) add new | |
252 | | |
|
255 | | | |
@@ -301,6 +304,7 b' setup' | |||||
301 | $ mkcommit new-unrelated |
|
304 | $ mkcommit new-unrelated | |
302 | created new head |
|
305 | created new head | |
303 | $ hg debugobsolete `getid old` |
|
306 | $ hg debugobsolete `getid old` | |
|
307 | 1 new obsolescence markers | |||
304 | obsoleted 1 changesets |
|
308 | obsoleted 1 changesets | |
305 | $ hg log -G --hidden |
|
309 | $ hg log -G --hidden | |
306 | @ 350a93b716be (draft) add new-unrelated |
|
310 | @ 350a93b716be (draft) add new-unrelated |
@@ -50,6 +50,7 b' Initial setup' | |||||
50 | $ mkcommit c_B0 |
|
50 | $ mkcommit c_B0 | |
51 | created new head |
|
51 | created new head | |
52 | $ hg debugobsolete `getid 'desc("c_A0")'` `getid 'desc("c_A1")'` |
|
52 | $ hg debugobsolete `getid 'desc("c_A0")'` `getid 'desc("c_A1")'` | |
|
53 | 1 new obsolescence markers | |||
53 | obsoleted 1 changesets |
|
54 | obsoleted 1 changesets | |
54 | $ hg log -G --hidden -v |
|
55 | $ hg log -G --hidden -v | |
55 | @ 3:e5d7dda7cd28 c_B0 |
|
56 | @ 3:e5d7dda7cd28 c_B0 | |
@@ -82,6 +83,7 b' server side: create new revision on the ' | |||||
82 | $ mkcommit c_B1 |
|
83 | $ mkcommit c_B1 | |
83 | created new head |
|
84 | created new head | |
84 | $ hg debugobsolete `getid 'desc("c_B0")'` `getid 'desc("c_B1")'` |
|
85 | $ hg debugobsolete `getid 'desc("c_B0")'` `getid 'desc("c_B1")'` | |
|
86 | 1 new obsolescence markers | |||
85 | obsoleted 1 changesets |
|
87 | obsoleted 1 changesets | |
86 | $ hg log -G |
|
88 | $ hg log -G | |
87 | @ 4:391a2bf12b1b c_B1 |
|
89 | @ 4:391a2bf12b1b c_B1 | |
@@ -111,6 +113,7 b' client side: create a marker between two' | |||||
111 |
|
113 | |||
112 | $ cd client |
|
114 | $ cd client | |
113 | $ hg debugobsolete `getid 'desc("c_A1")'` `getid 'desc("c_B0")'` |
|
115 | $ hg debugobsolete `getid 'desc("c_A1")'` `getid 'desc("c_B0")'` | |
|
116 | 1 new obsolescence markers | |||
114 | obsoleted 1 changesets |
|
117 | obsoleted 1 changesets | |
115 | $ hg log -G |
|
118 | $ hg log -G | |
116 | @ 3:e5d7dda7cd28 c_B0 |
|
119 | @ 3:e5d7dda7cd28 c_B0 | |
@@ -537,6 +540,7 b' Setup' | |||||
537 | $ cd repo-a |
|
540 | $ cd repo-a | |
538 | $ hg debugbuilddag .. |
|
541 | $ hg debugbuilddag .. | |
539 | $ hg debugobsolete `getid tip` |
|
542 | $ hg debugobsolete `getid tip` | |
|
543 | 1 new obsolescence markers | |||
540 | obsoleted 1 changesets |
|
544 | obsoleted 1 changesets | |
541 | $ cd ../ |
|
545 | $ cd ../ | |
542 | $ hg clone --pull repo-a repo-b |
|
546 | $ hg clone --pull repo-a repo-b |
@@ -64,8 +64,10 b' A_1 have two direct and divergent succes' | |||||
64 |
|
64 | |||
65 | $ newcase direct |
|
65 | $ newcase direct | |
66 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
66 | $ hg debugobsolete `getid A_0` `getid A_1` | |
|
67 | 1 new obsolescence markers | |||
67 | obsoleted 1 changesets |
|
68 | obsoleted 1 changesets | |
68 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
69 | $ hg debugobsolete `getid A_0` `getid A_2` | |
|
70 | 1 new obsolescence markers | |||
69 | 2 new content-divergent changesets |
|
71 | 2 new content-divergent changesets | |
70 | $ hg log -G --hidden |
|
72 | $ hg log -G --hidden | |
71 | * 3:392fd25390da A_2 |
|
73 | * 3:392fd25390da A_2 | |
@@ -124,12 +126,15 b' indirect divergence with known changeset' | |||||
124 |
|
126 | |||
125 | $ newcase indirect_known |
|
127 | $ newcase indirect_known | |
126 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
128 | $ hg debugobsolete `getid A_0` `getid A_1` | |
|
129 | 1 new obsolescence markers | |||
127 | obsoleted 1 changesets |
|
130 | obsoleted 1 changesets | |
128 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
131 | $ hg debugobsolete `getid A_0` `getid A_2` | |
|
132 | 1 new obsolescence markers | |||
129 | 2 new content-divergent changesets |
|
133 | 2 new content-divergent changesets | |
130 | $ mkcommit A_3 |
|
134 | $ mkcommit A_3 | |
131 | created new head |
|
135 | created new head | |
132 | $ hg debugobsolete `getid A_2` `getid A_3` |
|
136 | $ hg debugobsolete `getid A_2` `getid A_3` | |
|
137 | 1 new obsolescence markers | |||
133 | obsoleted 1 changesets |
|
138 | obsoleted 1 changesets | |
134 | $ hg log -G --hidden |
|
139 | $ hg log -G --hidden | |
135 | @ 4:01f36c5a8fda A_3 |
|
140 | @ 4:01f36c5a8fda A_3 | |
@@ -184,9 +189,12 b' indirect divergence with known changeset' | |||||
184 |
|
189 | |||
185 | $ newcase indirect_unknown |
|
190 | $ newcase indirect_unknown | |
186 | $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
|
191 | $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | |
|
192 | 1 new obsolescence markers | |||
187 | obsoleted 1 changesets |
|
193 | obsoleted 1 changesets | |
188 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` |
|
194 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` | |
|
195 | 1 new obsolescence markers | |||
189 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
196 | $ hg debugobsolete `getid A_0` `getid A_2` | |
|
197 | 1 new obsolescence markers | |||
190 | 2 new content-divergent changesets |
|
198 | 2 new content-divergent changesets | |
191 | $ hg log -G --hidden |
|
199 | $ hg log -G --hidden | |
192 | * 3:392fd25390da A_2 |
|
200 | * 3:392fd25390da A_2 | |
@@ -234,12 +242,17 b' do not take unknown node in account if t' | |||||
234 |
|
242 | |||
235 | $ newcase final-unknown |
|
243 | $ newcase final-unknown | |
236 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
244 | $ hg debugobsolete `getid A_0` `getid A_1` | |
|
245 | 1 new obsolescence markers | |||
237 | obsoleted 1 changesets |
|
246 | obsoleted 1 changesets | |
238 | $ hg debugobsolete `getid A_1` `getid A_2` |
|
247 | $ hg debugobsolete `getid A_1` `getid A_2` | |
|
248 | 1 new obsolescence markers | |||
239 | obsoleted 1 changesets |
|
249 | obsoleted 1 changesets | |
240 | $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
250 | $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
|
251 | 1 new obsolescence markers | |||
241 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc |
|
252 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc | |
|
253 | 1 new obsolescence markers | |||
242 | $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd |
|
254 | $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd | |
|
255 | 1 new obsolescence markers | |||
243 |
|
256 | |||
244 | $ hg debugsuccessorssets --hidden 'desc('A_0')' |
|
257 | $ hg debugsuccessorssets --hidden 'desc('A_0')' | |
245 | 007dc284c1f8 |
|
258 | 007dc284c1f8 | |
@@ -256,14 +269,18 b' divergence that converge again is not di' | |||||
256 |
|
269 | |||
257 | $ newcase converged_divergence |
|
270 | $ newcase converged_divergence | |
258 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
271 | $ hg debugobsolete `getid A_0` `getid A_1` | |
|
272 | 1 new obsolescence markers | |||
259 | obsoleted 1 changesets |
|
273 | obsoleted 1 changesets | |
260 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
274 | $ hg debugobsolete `getid A_0` `getid A_2` | |
|
275 | 1 new obsolescence markers | |||
261 | 2 new content-divergent changesets |
|
276 | 2 new content-divergent changesets | |
262 | $ mkcommit A_3 |
|
277 | $ mkcommit A_3 | |
263 | created new head |
|
278 | created new head | |
264 | $ hg debugobsolete `getid A_1` `getid A_3` |
|
279 | $ hg debugobsolete `getid A_1` `getid A_3` | |
|
280 | 1 new obsolescence markers | |||
265 | obsoleted 1 changesets |
|
281 | obsoleted 1 changesets | |
266 | $ hg debugobsolete `getid A_2` `getid A_3` |
|
282 | $ hg debugobsolete `getid A_2` `getid A_3` | |
|
283 | 1 new obsolescence markers | |||
267 | obsoleted 1 changesets |
|
284 | obsoleted 1 changesets | |
268 | $ hg log -G --hidden |
|
285 | $ hg log -G --hidden | |
269 | @ 4:01f36c5a8fda A_3 |
|
286 | @ 4:01f36c5a8fda A_3 | |
@@ -312,6 +329,7 b' split is not divergences' | |||||
312 |
|
329 | |||
313 | $ newcase split |
|
330 | $ newcase split | |
314 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` |
|
331 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` | |
|
332 | 1 new obsolescence markers | |||
315 | obsoleted 1 changesets |
|
333 | obsoleted 1 changesets | |
316 | $ hg log -G --hidden |
|
334 | $ hg log -G --hidden | |
317 | o 3:392fd25390da A_2 |
|
335 | o 3:392fd25390da A_2 | |
@@ -354,18 +372,21 b' Even when subsequent rewriting happen' | |||||
354 | $ mkcommit A_3 |
|
372 | $ mkcommit A_3 | |
355 | created new head |
|
373 | created new head | |
356 | $ hg debugobsolete `getid A_1` `getid A_3` |
|
374 | $ hg debugobsolete `getid A_1` `getid A_3` | |
|
375 | 1 new obsolescence markers | |||
357 | obsoleted 1 changesets |
|
376 | obsoleted 1 changesets | |
358 | $ hg up 0 |
|
377 | $ hg up 0 | |
359 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
378 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
360 | $ mkcommit A_4 |
|
379 | $ mkcommit A_4 | |
361 | created new head |
|
380 | created new head | |
362 | $ hg debugobsolete `getid A_2` `getid A_4` |
|
381 | $ hg debugobsolete `getid A_2` `getid A_4` | |
|
382 | 1 new obsolescence markers | |||
363 | obsoleted 1 changesets |
|
383 | obsoleted 1 changesets | |
364 | $ hg up 0 |
|
384 | $ hg up 0 | |
365 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
385 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
366 | $ mkcommit A_5 |
|
386 | $ mkcommit A_5 | |
367 | created new head |
|
387 | created new head | |
368 | $ hg debugobsolete `getid A_4` `getid A_5` |
|
388 | $ hg debugobsolete `getid A_4` `getid A_5` | |
|
389 | 1 new obsolescence markers | |||
369 | obsoleted 1 changesets |
|
390 | obsoleted 1 changesets | |
370 | $ hg log -G --hidden |
|
391 | $ hg log -G --hidden | |
371 | @ 6:e442cfc57690 A_5 |
|
392 | @ 6:e442cfc57690 A_5 | |
@@ -426,6 +447,7 b' Check more complex obsolescence graft (w' | |||||
426 | $ mkcommit B_0; hg up 0 |
|
447 | $ mkcommit B_0; hg up 0 | |
427 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
448 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
428 | $ hg debugobsolete `getid B_0` `getid A_2` |
|
449 | $ hg debugobsolete `getid B_0` `getid A_2` | |
|
450 | 1 new obsolescence markers | |||
429 | obsoleted 1 changesets |
|
451 | obsoleted 1 changesets | |
430 | $ mkcommit A_7; hg up 0 |
|
452 | $ mkcommit A_7; hg up 0 | |
431 | created new head |
|
453 | created new head | |
@@ -434,11 +456,13 b' Check more complex obsolescence graft (w' | |||||
434 | created new head |
|
456 | created new head | |
435 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
457 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
436 | $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8` |
|
458 | $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8` | |
|
459 | 1 new obsolescence markers | |||
437 | obsoleted 1 changesets |
|
460 | obsoleted 1 changesets | |
438 | $ mkcommit A_9; hg up 0 |
|
461 | $ mkcommit A_9; hg up 0 | |
439 | created new head |
|
462 | created new head | |
440 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
463 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
441 | $ hg debugobsolete `getid A_5` `getid A_9` |
|
464 | $ hg debugobsolete `getid A_5` `getid A_9` | |
|
465 | 1 new obsolescence markers | |||
442 | 4 new content-divergent changesets |
|
466 | 4 new content-divergent changesets | |
443 | $ hg log -G --hidden |
|
467 | $ hg log -G --hidden | |
444 | * 10:bed64f5d2f5a A_9 |
|
468 | * 10:bed64f5d2f5a A_9 | |
@@ -547,10 +571,13 b' fix the divergence' | |||||
547 | created new head |
|
571 | created new head | |
548 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
572 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
549 | $ hg debugobsolete `getid A_9` `getid A_A` |
|
573 | $ hg debugobsolete `getid A_9` `getid A_A` | |
|
574 | 1 new obsolescence markers | |||
550 | obsoleted 1 changesets |
|
575 | obsoleted 1 changesets | |
551 | $ hg debugobsolete `getid A_7` `getid A_A` |
|
576 | $ hg debugobsolete `getid A_7` `getid A_A` | |
|
577 | 1 new obsolescence markers | |||
552 | obsoleted 1 changesets |
|
578 | obsoleted 1 changesets | |
553 | $ hg debugobsolete `getid A_8` `getid A_A` |
|
579 | $ hg debugobsolete `getid A_8` `getid A_A` | |
|
580 | 1 new obsolescence markers | |||
554 | obsoleted 1 changesets |
|
581 | obsoleted 1 changesets | |
555 | $ hg log -G --hidden |
|
582 | $ hg log -G --hidden | |
556 | o 11:a139f71be9da A_A |
|
583 | o 11:a139f71be9da A_A | |
@@ -675,8 +702,10 b' successors-set. (report [A,B] not [A] + ' | |||||
675 |
|
702 | |||
676 | $ newcase subset |
|
703 | $ newcase subset | |
677 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
704 | $ hg debugobsolete `getid A_0` `getid A_2` | |
|
705 | 1 new obsolescence markers | |||
678 | obsoleted 1 changesets |
|
706 | obsoleted 1 changesets | |
679 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` |
|
707 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` | |
|
708 | 1 new obsolescence markers | |||
680 | $ hg debugsuccessorssets --hidden 'desc('A_0')' |
|
709 | $ hg debugsuccessorssets --hidden 'desc('A_0')' | |
681 | 007dc284c1f8 |
|
710 | 007dc284c1f8 | |
682 | 82623d38b9ba 392fd25390da |
|
711 | 82623d38b9ba 392fd25390da |
@@ -59,6 +59,7 b' Trigger tags cache population by doing s' | |||||
59 | Hiding a non-tip changeset should change filtered hash and cause tags recompute |
|
59 | Hiding a non-tip changeset should change filtered hash and cause tags recompute | |
60 |
|
60 | |||
61 | $ hg debugobsolete -d '0 0' c3cb30f2d2cd0aae008cc91a07876e3c5131fd22 -u dummyuser |
|
61 | $ hg debugobsolete -d '0 0' c3cb30f2d2cd0aae008cc91a07876e3c5131fd22 -u dummyuser | |
|
62 | 1 new obsolescence markers | |||
62 | obsoleted 1 changesets |
|
63 | obsoleted 1 changesets | |
63 |
|
64 | |||
64 | $ hg tags |
|
65 | $ hg tags | |
@@ -81,8 +82,10 b' Hiding a non-tip changeset should change' | |||||
81 | Hiding another changeset should cause the filtered hash to change |
|
82 | Hiding another changeset should cause the filtered hash to change | |
82 |
|
83 | |||
83 | $ hg debugobsolete -d '0 0' d75775ffbc6bca1794d300f5571272879bd280da -u dummyuser |
|
84 | $ hg debugobsolete -d '0 0' d75775ffbc6bca1794d300f5571272879bd280da -u dummyuser | |
|
85 | 1 new obsolescence markers | |||
84 | obsoleted 1 changesets |
|
86 | obsoleted 1 changesets | |
85 | $ hg debugobsolete -d '0 0' 5f97d42da03fd56f3b228b03dfe48af5c0adf75b -u dummyuser |
|
87 | $ hg debugobsolete -d '0 0' 5f97d42da03fd56f3b228b03dfe48af5c0adf75b -u dummyuser | |
|
88 | 1 new obsolescence markers | |||
86 | obsoleted 1 changesets |
|
89 | obsoleted 1 changesets | |
87 |
|
90 | |||
88 | $ hg tags |
|
91 | $ hg tags |
@@ -52,6 +52,7 b' Killing a single changeset without repla' | |||||
52 | abort: changeset references must be full hexadecimal node identifiers |
|
52 | abort: changeset references must be full hexadecimal node identifiers | |
53 | [255] |
|
53 | [255] | |
54 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
|
54 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar | |
|
55 | 1 new obsolescence markers | |||
55 | obsoleted 1 changesets |
|
56 | obsoleted 1 changesets | |
56 | $ hg debugobsolete |
|
57 | $ hg debugobsolete | |
57 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} |
|
58 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} | |
@@ -88,6 +89,7 b' Killing a single changeset with replacem' | |||||
88 | created new head |
|
89 | created new head | |
89 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
90 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
90 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' |
|
91 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' | |
|
92 | 1 new obsolescence markers | |||
91 | obsoleted 1 changesets |
|
93 | obsoleted 1 changesets | |
92 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
94 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
93 | 2:245bde4270cd add original_c |
|
95 | 2:245bde4270cd add original_c | |
@@ -112,6 +114,7 b' do it again (it read the obsstore before' | |||||
112 | $ mkcommit new_2_c |
|
114 | $ mkcommit new_2_c | |
113 | created new head |
|
115 | created new head | |
114 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` |
|
116 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` | |
|
117 | 1 new obsolescence markers | |||
115 | obsoleted 1 changesets |
|
118 | obsoleted 1 changesets | |
116 | $ hg debugobsolete |
|
119 | $ hg debugobsolete | |
117 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
120 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
@@ -124,8 +127,10 b' Register two markers with a missing node' | |||||
124 | $ mkcommit new_3_c |
|
127 | $ mkcommit new_3_c | |
125 | created new head |
|
128 | created new head | |
126 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 |
|
129 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 | |
|
130 | 1 new obsolescence markers | |||
127 | obsoleted 1 changesets |
|
131 | obsoleted 1 changesets | |
128 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` |
|
132 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` | |
|
133 | 1 new obsolescence markers | |||
129 | $ hg debugobsolete |
|
134 | $ hg debugobsolete | |
130 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
135 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
131 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
136 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
@@ -264,6 +269,7 b' We need to create a clone of 5 and add a' | |||||
264 | $ hg ci -m 'add n3w_3_c' |
|
269 | $ hg ci -m 'add n3w_3_c' | |
265 | created new head |
|
270 | created new head | |
266 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
|
271 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` | |
|
272 | 1 new obsolescence markers | |||
267 | obsoleted 1 changesets |
|
273 | obsoleted 1 changesets | |
268 | $ hg log -r 'phasedivergent()' |
|
274 | $ hg log -r 'phasedivergent()' | |
269 | $ hg log -G |
|
275 | $ hg log -G | |
@@ -323,6 +329,7 b' Revision 0 is hidden' | |||||
323 | $ mkcommit kill0 |
|
329 | $ mkcommit kill0 | |
324 | $ hg up -q null |
|
330 | $ hg up -q null | |
325 | $ hg debugobsolete `getid kill0` |
|
331 | $ hg debugobsolete `getid kill0` | |
|
332 | 1 new obsolescence markers | |||
326 | obsoleted 1 changesets |
|
333 | obsoleted 1 changesets | |
327 | $ mkcommit a |
|
334 | $ mkcommit a | |
328 | $ mkcommit b |
|
335 | $ mkcommit b | |
@@ -349,6 +356,7 b' Can disable transaction summary report' | |||||
349 | $ mkcommit b |
|
356 | $ mkcommit b | |
350 | $ hg up -q null |
|
357 | $ hg up -q null | |
351 | $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a` |
|
358 | $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a` | |
|
359 | 1 new obsolescence markers | |||
352 | obsoleted 1 changesets |
|
360 | obsoleted 1 changesets | |
353 | $ cd .. |
|
361 | $ cd .. | |
354 |
|
362 | |||
@@ -392,6 +400,7 b' Try to pull markers' | |||||
392 | Rollback//Transaction support |
|
400 | Rollback//Transaction support | |
393 |
|
401 | |||
394 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
402 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
|
403 | 1 new obsolescence markers | |||
395 | $ hg debugobsolete |
|
404 | $ hg debugobsolete | |
396 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
405 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
397 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
406 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
@@ -478,6 +487,7 b' On pull' | |||||
478 | $ hg init tmpe |
|
487 | $ hg init tmpe | |
479 | $ cd tmpe |
|
488 | $ cd tmpe | |
480 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 |
|
489 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 | |
|
490 | 1 new obsolescence markers | |||
481 | $ hg pull ../tmpb |
|
491 | $ hg pull ../tmpb | |
482 | pulling from ../tmpb |
|
492 | pulling from ../tmpb | |
483 | requesting all changes |
|
493 | requesting all changes | |
@@ -531,6 +541,7 b' detect outgoing obsolete and unstable' | |||||
531 | $ mkcommit original_d |
|
541 | $ mkcommit original_d | |
532 | $ mkcommit original_e |
|
542 | $ mkcommit original_e | |
533 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' |
|
543 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' | |
|
544 | 1 new obsolescence markers | |||
534 | obsoleted 1 changesets |
|
545 | obsoleted 1 changesets | |
535 | 1 new orphan changesets |
|
546 | 1 new orphan changesets | |
536 | $ hg debugobsolete | grep `getid original_d` |
|
547 | $ hg debugobsolete | grep `getid original_d` | |
@@ -627,6 +638,7 b' Do not warn about new head when the new ' | |||||
627 | created new head |
|
638 | created new head | |
628 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \ |
|
639 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \ | |
629 | > -u 'test <test@example.net>' |
|
640 | > -u 'test <test@example.net>' | |
|
641 | 1 new obsolescence markers | |||
630 | obsoleted 1 changesets |
|
642 | obsoleted 1 changesets | |
631 | $ hg outgoing ../tmpf # parasite hg outgoing testin |
|
643 | $ hg outgoing ../tmpf # parasite hg outgoing testin | |
632 | comparing with ../tmpf |
|
644 | comparing with ../tmpf | |
@@ -812,65 +824,125 b' check hgweb does not explode' | |||||
812 | > do |
|
824 | > do | |
813 | > hg debugobsolete $node |
|
825 | > hg debugobsolete $node | |
814 | > done |
|
826 | > done | |
|
827 | 1 new obsolescence markers | |||
815 | obsoleted 1 changesets |
|
828 | obsoleted 1 changesets | |
|
829 | 1 new obsolescence markers | |||
816 | obsoleted 1 changesets |
|
830 | obsoleted 1 changesets | |
|
831 | 1 new obsolescence markers | |||
817 | obsoleted 1 changesets |
|
832 | obsoleted 1 changesets | |
|
833 | 1 new obsolescence markers | |||
818 | obsoleted 1 changesets |
|
834 | obsoleted 1 changesets | |
|
835 | 1 new obsolescence markers | |||
819 | obsoleted 1 changesets |
|
836 | obsoleted 1 changesets | |
|
837 | 1 new obsolescence markers | |||
820 | obsoleted 1 changesets |
|
838 | obsoleted 1 changesets | |
|
839 | 1 new obsolescence markers | |||
821 | obsoleted 1 changesets |
|
840 | obsoleted 1 changesets | |
|
841 | 1 new obsolescence markers | |||
822 | obsoleted 1 changesets |
|
842 | obsoleted 1 changesets | |
|
843 | 1 new obsolescence markers | |||
823 | obsoleted 1 changesets |
|
844 | obsoleted 1 changesets | |
|
845 | 1 new obsolescence markers | |||
824 | obsoleted 1 changesets |
|
846 | obsoleted 1 changesets | |
|
847 | 1 new obsolescence markers | |||
825 | obsoleted 1 changesets |
|
848 | obsoleted 1 changesets | |
|
849 | 1 new obsolescence markers | |||
826 | obsoleted 1 changesets |
|
850 | obsoleted 1 changesets | |
|
851 | 1 new obsolescence markers | |||
827 | obsoleted 1 changesets |
|
852 | obsoleted 1 changesets | |
|
853 | 1 new obsolescence markers | |||
828 | obsoleted 1 changesets |
|
854 | obsoleted 1 changesets | |
|
855 | 1 new obsolescence markers | |||
829 | obsoleted 1 changesets |
|
856 | obsoleted 1 changesets | |
|
857 | 1 new obsolescence markers | |||
830 | obsoleted 1 changesets |
|
858 | obsoleted 1 changesets | |
|
859 | 1 new obsolescence markers | |||
831 | obsoleted 1 changesets |
|
860 | obsoleted 1 changesets | |
|
861 | 1 new obsolescence markers | |||
832 | obsoleted 1 changesets |
|
862 | obsoleted 1 changesets | |
|
863 | 1 new obsolescence markers | |||
833 | obsoleted 1 changesets |
|
864 | obsoleted 1 changesets | |
|
865 | 1 new obsolescence markers | |||
834 | obsoleted 1 changesets |
|
866 | obsoleted 1 changesets | |
|
867 | 1 new obsolescence markers | |||
835 | obsoleted 1 changesets |
|
868 | obsoleted 1 changesets | |
|
869 | 1 new obsolescence markers | |||
836 | obsoleted 1 changesets |
|
870 | obsoleted 1 changesets | |
|
871 | 1 new obsolescence markers | |||
837 | obsoleted 1 changesets |
|
872 | obsoleted 1 changesets | |
|
873 | 1 new obsolescence markers | |||
838 | obsoleted 1 changesets |
|
874 | obsoleted 1 changesets | |
|
875 | 1 new obsolescence markers | |||
839 | obsoleted 1 changesets |
|
876 | obsoleted 1 changesets | |
|
877 | 1 new obsolescence markers | |||
840 | obsoleted 1 changesets |
|
878 | obsoleted 1 changesets | |
|
879 | 1 new obsolescence markers | |||
841 | obsoleted 1 changesets |
|
880 | obsoleted 1 changesets | |
|
881 | 1 new obsolescence markers | |||
842 | obsoleted 1 changesets |
|
882 | obsoleted 1 changesets | |
|
883 | 1 new obsolescence markers | |||
843 | obsoleted 1 changesets |
|
884 | obsoleted 1 changesets | |
|
885 | 1 new obsolescence markers | |||
844 | obsoleted 1 changesets |
|
886 | obsoleted 1 changesets | |
|
887 | 1 new obsolescence markers | |||
845 | obsoleted 1 changesets |
|
888 | obsoleted 1 changesets | |
|
889 | 1 new obsolescence markers | |||
846 | obsoleted 1 changesets |
|
890 | obsoleted 1 changesets | |
|
891 | 1 new obsolescence markers | |||
847 | obsoleted 1 changesets |
|
892 | obsoleted 1 changesets | |
|
893 | 1 new obsolescence markers | |||
848 | obsoleted 1 changesets |
|
894 | obsoleted 1 changesets | |
|
895 | 1 new obsolescence markers | |||
849 | obsoleted 1 changesets |
|
896 | obsoleted 1 changesets | |
|
897 | 1 new obsolescence markers | |||
850 | obsoleted 1 changesets |
|
898 | obsoleted 1 changesets | |
|
899 | 1 new obsolescence markers | |||
851 | obsoleted 1 changesets |
|
900 | obsoleted 1 changesets | |
|
901 | 1 new obsolescence markers | |||
852 | obsoleted 1 changesets |
|
902 | obsoleted 1 changesets | |
|
903 | 1 new obsolescence markers | |||
853 | obsoleted 1 changesets |
|
904 | obsoleted 1 changesets | |
|
905 | 1 new obsolescence markers | |||
854 | obsoleted 1 changesets |
|
906 | obsoleted 1 changesets | |
|
907 | 1 new obsolescence markers | |||
855 | obsoleted 1 changesets |
|
908 | obsoleted 1 changesets | |
|
909 | 1 new obsolescence markers | |||
856 | obsoleted 1 changesets |
|
910 | obsoleted 1 changesets | |
|
911 | 1 new obsolescence markers | |||
857 | obsoleted 1 changesets |
|
912 | obsoleted 1 changesets | |
|
913 | 1 new obsolescence markers | |||
858 | obsoleted 1 changesets |
|
914 | obsoleted 1 changesets | |
|
915 | 1 new obsolescence markers | |||
859 | obsoleted 1 changesets |
|
916 | obsoleted 1 changesets | |
|
917 | 1 new obsolescence markers | |||
860 | obsoleted 1 changesets |
|
918 | obsoleted 1 changesets | |
|
919 | 1 new obsolescence markers | |||
861 | obsoleted 1 changesets |
|
920 | obsoleted 1 changesets | |
|
921 | 1 new obsolescence markers | |||
862 | obsoleted 1 changesets |
|
922 | obsoleted 1 changesets | |
|
923 | 1 new obsolescence markers | |||
863 | obsoleted 1 changesets |
|
924 | obsoleted 1 changesets | |
|
925 | 1 new obsolescence markers | |||
864 | obsoleted 1 changesets |
|
926 | obsoleted 1 changesets | |
|
927 | 1 new obsolescence markers | |||
865 | obsoleted 1 changesets |
|
928 | obsoleted 1 changesets | |
|
929 | 1 new obsolescence markers | |||
866 | obsoleted 1 changesets |
|
930 | obsoleted 1 changesets | |
|
931 | 1 new obsolescence markers | |||
867 | obsoleted 1 changesets |
|
932 | obsoleted 1 changesets | |
|
933 | 1 new obsolescence markers | |||
868 | obsoleted 1 changesets |
|
934 | obsoleted 1 changesets | |
|
935 | 1 new obsolescence markers | |||
869 | obsoleted 1 changesets |
|
936 | obsoleted 1 changesets | |
|
937 | 1 new obsolescence markers | |||
870 | obsoleted 1 changesets |
|
938 | obsoleted 1 changesets | |
|
939 | 1 new obsolescence markers | |||
871 | obsoleted 1 changesets |
|
940 | obsoleted 1 changesets | |
|
941 | 1 new obsolescence markers | |||
872 | obsoleted 1 changesets |
|
942 | obsoleted 1 changesets | |
|
943 | 1 new obsolescence markers | |||
873 | obsoleted 1 changesets |
|
944 | obsoleted 1 changesets | |
|
945 | 1 new obsolescence markers | |||
874 | obsoleted 1 changesets |
|
946 | obsoleted 1 changesets | |
875 | $ hg up tip |
|
947 | $ hg up tip | |
876 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
948 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -938,9 +1010,11 b' reenable for later test' | |||||
938 | Several troubles on the same changeset (create an unstable and bumped and content-divergent changeset) |
|
1010 | Several troubles on the same changeset (create an unstable and bumped and content-divergent changeset) | |
939 |
|
1011 | |||
940 | $ hg debugobsolete `getid obsolete_e` |
|
1012 | $ hg debugobsolete `getid obsolete_e` | |
|
1013 | 1 new obsolescence markers | |||
941 | obsoleted 1 changesets |
|
1014 | obsoleted 1 changesets | |
942 | 2 new orphan changesets |
|
1015 | 2 new orphan changesets | |
943 | $ hg debugobsolete `getid original_c` `getid babar` |
|
1016 | $ hg debugobsolete `getid original_c` `getid babar` | |
|
1017 | 1 new obsolescence markers | |||
944 | 1 new phase-divergent changesets |
|
1018 | 1 new phase-divergent changesets | |
945 | 2 new content-divergent changesets |
|
1019 | 2 new content-divergent changesets | |
946 | $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan() and contentdivergent()' |
|
1020 | $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan() and contentdivergent()' | |
@@ -1309,6 +1383,7 b' Test issue 4506' | |||||
1309 | grafting 1:1c9eddb02162 "content-1" (tip) |
|
1383 | grafting 1:1c9eddb02162 "content-1" (tip) | |
1310 |
|
1384 | |||
1311 | $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` |
|
1385 | $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` | |
|
1386 | 1 new obsolescence markers | |||
1312 | obsoleted 1 changesets |
|
1387 | obsoleted 1 changesets | |
1313 |
|
1388 | |||
1314 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1389 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
@@ -1610,6 +1685,7 b' Test adding changeset after obsmarkers a' | |||||
1610 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1685 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1611 | saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg |
|
1686 | saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg | |
1612 | $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b |
|
1687 | $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b | |
|
1688 | 1 new obsolescence markers | |||
1613 | $ hg unbundle ../bundle-2.hg |
|
1689 | $ hg unbundle ../bundle-2.hg | |
1614 | adding changesets |
|
1690 | adding changesets | |
1615 | adding manifests |
|
1691 | adding manifests |
@@ -638,6 +638,7 b' test hidden changeset are not cloned as ' | |||||
638 |
|
638 | |||
639 | (making a changeset hidden; H in that case) |
|
639 | (making a changeset hidden; H in that case) | |
640 | $ hg debugobsolete `hg id --debug -r 5` |
|
640 | $ hg debugobsolete `hg id --debug -r 5` | |
|
641 | 1 new obsolescence markers | |||
641 | obsoleted 1 changesets |
|
642 | obsoleted 1 changesets | |
642 |
|
643 | |||
643 | $ cd .. |
|
644 | $ cd .. |
@@ -60,6 +60,7 b' Test setup' | |||||
60 | $ mkcommit B1 |
|
60 | $ mkcommit B1 | |
61 | created new head |
|
61 | created new head | |
62 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
|
62 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | |
|
63 | 1 new obsolescence markers | |||
63 | obsoleted 1 changesets |
|
64 | obsoleted 1 changesets | |
64 | $ hg log -G --hidden |
|
65 | $ hg log -G --hidden | |
65 | @ 25c56d33e4c4 (draft): B1 |
|
66 | @ 25c56d33e4c4 (draft): B1 |
@@ -60,6 +60,7 b' Test setup' | |||||
60 | $ mkcommit A1 |
|
60 | $ mkcommit A1 | |
61 | created new head |
|
61 | created new head | |
62 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
62 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
63 | 1 new obsolescence markers | |||
63 | obsoleted 1 changesets |
|
64 | obsoleted 1 changesets | |
64 | 1 new orphan changesets |
|
65 | 1 new orphan changesets | |
65 | $ hg log -G --hidden |
|
66 | $ hg log -G --hidden |
@@ -60,6 +60,7 b' Test setup' | |||||
60 | $ mkcommit C0 |
|
60 | $ mkcommit C0 | |
61 | created new head |
|
61 | created new head | |
62 | $ hg debugobsolete --record-parents `getid "desc(B0)"` |
|
62 | $ hg debugobsolete --record-parents `getid "desc(B0)"` | |
|
63 | 1 new obsolescence markers | |||
63 | obsoleted 1 changesets |
|
64 | obsoleted 1 changesets | |
64 | $ hg log -G --hidden |
|
65 | $ hg log -G --hidden | |
65 | @ 0f88766e02d6 (draft): C0 |
|
66 | @ 0f88766e02d6 (draft): C0 |
@@ -60,6 +60,7 b' Test setup' | |||||
60 | $ mkcommit C0 |
|
60 | $ mkcommit C0 | |
61 | created new head |
|
61 | created new head | |
62 | $ hg debugobsolete --record-parents `getid "desc(A0)"` |
|
62 | $ hg debugobsolete --record-parents `getid "desc(A0)"` | |
|
63 | 1 new obsolescence markers | |||
63 | obsoleted 1 changesets |
|
64 | obsoleted 1 changesets | |
64 | 1 new orphan changesets |
|
65 | 1 new orphan changesets | |
65 | $ hg log -G --hidden |
|
66 | $ hg log -G --hidden |
@@ -49,6 +49,7 b' Test setup' | |||||
49 | $ mkcommit B0 |
|
49 | $ mkcommit B0 | |
50 | created new head |
|
50 | created new head | |
51 | $ hg debugobsolete --record-parents `getid "desc(A0)"` |
|
51 | $ hg debugobsolete --record-parents `getid "desc(A0)"` | |
|
52 | 1 new obsolescence markers | |||
52 | obsoleted 1 changesets |
|
53 | obsoleted 1 changesets | |
53 | $ hg log -G --hidden |
|
54 | $ hg log -G --hidden | |
54 | @ 74ff5441d343 (draft): B0 |
|
55 | @ 74ff5441d343 (draft): B0 |
@@ -60,9 +60,11 b' Test setup' | |||||
60 | $ mkcommit A1 |
|
60 | $ mkcommit A1 | |
61 | created new head |
|
61 | created new head | |
62 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
62 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
63 | 1 new obsolescence markers | |||
63 | obsoleted 1 changesets |
|
64 | obsoleted 1 changesets | |
64 | 1 new orphan changesets |
|
65 | 1 new orphan changesets | |
65 | $ hg debugobsolete --record-parents `getid "desc(B0)"` |
|
66 | $ hg debugobsolete --record-parents `getid "desc(B0)"` | |
|
67 | 1 new obsolescence markers | |||
66 | obsoleted 1 changesets |
|
68 | obsoleted 1 changesets | |
67 | $ hg log -G --hidden |
|
69 | $ hg log -G --hidden | |
68 | @ f6082bc4ffef (draft): A1 |
|
70 | @ f6082bc4ffef (draft): A1 |
@@ -60,9 +60,11 b' Test setup' | |||||
60 | $ mkcommit B1 |
|
60 | $ mkcommit B1 | |
61 | created new head |
|
61 | created new head | |
62 | $ hg debugobsolete --record-parents `getid "desc(A0)"` |
|
62 | $ hg debugobsolete --record-parents `getid "desc(A0)"` | |
|
63 | 1 new obsolescence markers | |||
63 | obsoleted 1 changesets |
|
64 | obsoleted 1 changesets | |
64 | 1 new orphan changesets |
|
65 | 1 new orphan changesets | |
65 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
|
66 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | |
|
67 | 1 new obsolescence markers | |||
66 | obsoleted 1 changesets |
|
68 | obsoleted 1 changesets | |
67 | $ hg log -G --hidden |
|
69 | $ hg log -G --hidden | |
68 | @ 25c56d33e4c4 (draft): B1 |
|
70 | @ 25c56d33e4c4 (draft): B1 |
@@ -61,9 +61,11 b' Test setup' | |||||
61 | $ mkcommit C0 |
|
61 | $ mkcommit C0 | |
62 | created new head |
|
62 | created new head | |
63 | $ hg debugobsolete --record-parents `getid "desc(A0)"` |
|
63 | $ hg debugobsolete --record-parents `getid "desc(A0)"` | |
|
64 | 1 new obsolescence markers | |||
64 | obsoleted 1 changesets |
|
65 | obsoleted 1 changesets | |
65 | 1 new orphan changesets |
|
66 | 1 new orphan changesets | |
66 | $ hg debugobsolete --record-parents `getid "desc(B0)"` |
|
67 | $ hg debugobsolete --record-parents `getid "desc(B0)"` | |
|
68 | 1 new obsolescence markers | |||
67 | obsoleted 1 changesets |
|
69 | obsoleted 1 changesets | |
68 | $ hg log -G --hidden |
|
70 | $ hg log -G --hidden | |
69 | @ 0f88766e02d6 (draft): C0 |
|
71 | @ 0f88766e02d6 (draft): C0 |
@@ -64,11 +64,14 b' Test setup' | |||||
64 | $ mkcommit B1 |
|
64 | $ mkcommit B1 | |
65 | created new head |
|
65 | created new head | |
66 | $ hg debugobsolete --record-parents `getid "desc(A0)"` |
|
66 | $ hg debugobsolete --record-parents `getid "desc(A0)"` | |
|
67 | 1 new obsolescence markers | |||
67 | obsoleted 1 changesets |
|
68 | obsoleted 1 changesets | |
68 | 2 new orphan changesets |
|
69 | 2 new orphan changesets | |
69 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` |
|
70 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` | |
|
71 | 1 new obsolescence markers | |||
70 | obsoleted 1 changesets |
|
72 | obsoleted 1 changesets | |
71 | $ hg debugobsolete --record-parents `getid "desc(C0)"` |
|
73 | $ hg debugobsolete --record-parents `getid "desc(C0)"` | |
|
74 | 1 new obsolescence markers | |||
72 | obsoleted 1 changesets |
|
75 | obsoleted 1 changesets | |
73 | $ hg log -G --hidden |
|
76 | $ hg log -G --hidden | |
74 | @ 25c56d33e4c4 (draft): B1 |
|
77 | @ 25c56d33e4c4 (draft): B1 |
@@ -52,8 +52,10 b' Test setup' | |||||
52 | $ hg up 'desc(B0)' |
|
52 | $ hg up 'desc(B0)' | |
53 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
53 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
54 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` |
|
54 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` | |
|
55 | 1 new obsolescence markers | |||
55 | obsoleted 1 changesets |
|
56 | obsoleted 1 changesets | |
56 | $ hg debugobsolete --record-parents `getid "desc(A1)"` |
|
57 | $ hg debugobsolete --record-parents `getid "desc(A1)"` | |
|
58 | 1 new obsolescence markers | |||
57 | obsoleted 1 changesets |
|
59 | obsoleted 1 changesets | |
58 | $ hg log -G --hidden |
|
60 | $ hg log -G --hidden | |
59 | x ba93660aff8d (draft): A1 |
|
61 | x ba93660aff8d (draft): A1 |
@@ -51,8 +51,10 b' Test setup' | |||||
51 | $ hg up 'desc(B0)' |
|
51 | $ hg up 'desc(B0)' | |
52 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
52 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
53 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` |
|
53 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` | |
|
54 | 1 new obsolescence markers | |||
54 | obsoleted 1 changesets |
|
55 | obsoleted 1 changesets | |
55 | $ hg debugobsolete --record-parents `getid "desc(A1)"` |
|
56 | $ hg debugobsolete --record-parents `getid "desc(A1)"` | |
|
57 | 1 new obsolescence markers | |||
56 | obsoleted 1 changesets |
|
58 | obsoleted 1 changesets | |
57 | $ hg log -G --hidden |
|
59 | $ hg log -G --hidden | |
58 | x ba93660aff8d (draft): A1 |
|
60 | x ba93660aff8d (draft): A1 |
@@ -67,13 +67,17 b' Test setup' | |||||
67 | $ mkcommit A2 |
|
67 | $ mkcommit A2 | |
68 | created new head |
|
68 | created new head | |
69 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
69 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
70 | 1 new obsolescence markers | |||
70 | obsoleted 1 changesets |
|
71 | obsoleted 1 changesets | |
71 | 1 new orphan changesets |
|
72 | 1 new orphan changesets | |
72 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
|
73 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | |
|
74 | 1 new obsolescence markers | |||
73 | obsoleted 1 changesets |
|
75 | obsoleted 1 changesets | |
74 | $ hg debugobsolete --record-parents `getid "desc(B1)"` |
|
76 | $ hg debugobsolete --record-parents `getid "desc(B1)"` | |
|
77 | 1 new obsolescence markers | |||
75 | obsoleted 1 changesets |
|
78 | obsoleted 1 changesets | |
76 | $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` |
|
79 | $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` | |
|
80 | 1 new obsolescence markers | |||
77 | obsoleted 1 changesets |
|
81 | obsoleted 1 changesets | |
78 | $ hg log -G --hidden |
|
82 | $ hg log -G --hidden | |
79 | @ c1f8d089020f (draft): A2 |
|
83 | @ c1f8d089020f (draft): A2 |
@@ -46,6 +46,7 b' Test setup' | |||||
46 | $ mkcommit A1 |
|
46 | $ mkcommit A1 | |
47 | created new head |
|
47 | created new head | |
48 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
48 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
49 | 1 new obsolescence markers | |||
49 | obsoleted 1 changesets |
|
50 | obsoleted 1 changesets | |
50 | $ hg log -G --hidden |
|
51 | $ hg log -G --hidden | |
51 | @ f6082bc4ffef (draft): A1 |
|
52 | @ f6082bc4ffef (draft): A1 |
@@ -60,9 +60,11 b' Test setup' | |||||
60 | created new head |
|
60 | created new head | |
61 | $ mkcommit B1 |
|
61 | $ mkcommit B1 | |
62 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
62 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
63 | 1 new obsolescence markers | |||
63 | obsoleted 1 changesets |
|
64 | obsoleted 1 changesets | |
64 | 1 new orphan changesets |
|
65 | 1 new orphan changesets | |
65 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
|
66 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | |
|
67 | 1 new obsolescence markers | |||
66 | obsoleted 1 changesets |
|
68 | obsoleted 1 changesets | |
67 | $ hg log -G --hidden |
|
69 | $ hg log -G --hidden | |
68 | @ 262c8c798096 (draft): B1 |
|
70 | @ 262c8c798096 (draft): B1 |
@@ -63,9 +63,11 b' Test setup' | |||||
63 | created new head |
|
63 | created new head | |
64 | $ mkcommit A1 |
|
64 | $ mkcommit A1 | |
65 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
65 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
66 | 1 new obsolescence markers | |||
66 | obsoleted 1 changesets |
|
67 | obsoleted 1 changesets | |
67 | 1 new orphan changesets |
|
68 | 1 new orphan changesets | |
68 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
|
69 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | |
|
70 | 1 new obsolescence markers | |||
69 | obsoleted 1 changesets |
|
71 | obsoleted 1 changesets | |
70 | $ hg log -G --hidden |
|
72 | $ hg log -G --hidden | |
71 | @ c1c7524e9488 (draft): A1 |
|
73 | @ c1c7524e9488 (draft): A1 |
@@ -48,6 +48,7 b' Test setup' | |||||
48 | $ mkcommit A1 |
|
48 | $ mkcommit A1 | |
49 | created new head |
|
49 | created new head | |
50 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
50 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
51 | 1 new obsolescence markers | |||
51 | obsoleted 1 changesets |
|
52 | obsoleted 1 changesets | |
52 | $ mkcommit B0 |
|
53 | $ mkcommit B0 | |
53 | $ hg log -G --hidden |
|
54 | $ hg log -G --hidden |
@@ -49,6 +49,7 b' Test setup' | |||||
49 | created new head |
|
49 | created new head | |
50 | $ mkcommit A1 |
|
50 | $ mkcommit A1 | |
51 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
51 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
52 | 1 new obsolescence markers | |||
52 | obsoleted 1 changesets |
|
53 | obsoleted 1 changesets | |
53 | $ hg log -G --hidden |
|
54 | $ hg log -G --hidden | |
54 | @ ba93660aff8d (draft): A1 |
|
55 | @ ba93660aff8d (draft): A1 |
@@ -69,9 +69,11 b' Test setup' | |||||
69 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
69 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
70 | $ mkcommit B1 |
|
70 | $ mkcommit B1 | |
71 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
71 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
72 | 1 new obsolescence markers | |||
72 | obsoleted 1 changesets |
|
73 | obsoleted 1 changesets | |
73 | 1 new orphan changesets |
|
74 | 1 new orphan changesets | |
74 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
|
75 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | |
|
76 | 1 new obsolescence markers | |||
75 | obsoleted 1 changesets |
|
77 | obsoleted 1 changesets | |
76 | $ hg log -G --hidden |
|
78 | $ hg log -G --hidden | |
77 | @ d70a1f75a020 (draft): B1 |
|
79 | @ d70a1f75a020 (draft): B1 |
@@ -69,9 +69,11 b' Test setup' | |||||
69 | $ mkcommit B1 |
|
69 | $ mkcommit B1 | |
70 | created new head |
|
70 | created new head | |
71 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
71 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
72 | 1 new obsolescence markers | |||
72 | obsoleted 1 changesets |
|
73 | obsoleted 1 changesets | |
73 | 1 new orphan changesets |
|
74 | 1 new orphan changesets | |
74 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
|
75 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | |
|
76 | 1 new obsolescence markers | |||
75 | obsoleted 1 changesets |
|
77 | obsoleted 1 changesets | |
76 | $ hg log -G --hidden |
|
78 | $ hg log -G --hidden | |
77 | @ 25c56d33e4c4 (draft): B1 |
|
79 | @ 25c56d33e4c4 (draft): B1 |
@@ -53,8 +53,10 b' Test setup' | |||||
53 | $ mkcommit A2 |
|
53 | $ mkcommit A2 | |
54 | created new head |
|
54 | created new head | |
55 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
55 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
56 | 1 new obsolescence markers | |||
56 | obsoleted 1 changesets |
|
57 | obsoleted 1 changesets | |
57 | $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` |
|
58 | $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` | |
|
59 | 1 new obsolescence markers | |||
58 | obsoleted 1 changesets |
|
60 | obsoleted 1 changesets | |
59 | $ hg log -G --hidden |
|
61 | $ hg log -G --hidden | |
60 | @ c1f8d089020f (draft): A2 |
|
62 | @ c1f8d089020f (draft): A2 |
@@ -49,6 +49,7 b' Test setup' | |||||
49 | $ mkcommit A1 |
|
49 | $ mkcommit A1 | |
50 | created new head |
|
50 | created new head | |
51 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
51 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
52 | 1 new obsolescence markers | |||
52 | obsoleted 1 changesets |
|
53 | obsoleted 1 changesets | |
53 | $ hg up 0 |
|
54 | $ hg up 0 | |
54 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
55 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -64,9 +64,11 b' Test setup' | |||||
64 | $ mkcommit A1 |
|
64 | $ mkcommit A1 | |
65 | created new head |
|
65 | created new head | |
66 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
66 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
67 | 1 new obsolescence markers | |||
67 | obsoleted 1 changesets |
|
68 | obsoleted 1 changesets | |
68 | 1 new orphan changesets |
|
69 | 1 new orphan changesets | |
69 | $ hg debugobsolete --record-parents `getid "desc(B0)"` |
|
70 | $ hg debugobsolete --record-parents `getid "desc(B0)"` | |
|
71 | 1 new obsolescence markers | |||
70 | obsoleted 1 changesets |
|
72 | obsoleted 1 changesets | |
71 | $ hg up 0 |
|
73 | $ hg up 0 | |
72 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
74 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -67,9 +67,11 b' Test setup' | |||||
67 | $ mkcommit B1 |
|
67 | $ mkcommit B1 | |
68 | created new head |
|
68 | created new head | |
69 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
69 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
70 | 1 new obsolescence markers | |||
70 | obsoleted 1 changesets |
|
71 | obsoleted 1 changesets | |
71 | 1 new orphan changesets |
|
72 | 1 new orphan changesets | |
72 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
|
73 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | |
|
74 | 1 new obsolescence markers | |||
73 | obsoleted 1 changesets |
|
75 | obsoleted 1 changesets | |
74 | $ hg log -G --hidden |
|
76 | $ hg log -G --hidden | |
75 | @ 25c56d33e4c4 (draft): B1 |
|
77 | @ 25c56d33e4c4 (draft): B1 |
@@ -83,9 +83,11 b' Test setup' | |||||
83 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
83 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
84 | $ mkcommit B1 |
|
84 | $ mkcommit B1 | |
85 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
85 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
86 | 1 new obsolescence markers | |||
86 | obsoleted 1 changesets |
|
87 | obsoleted 1 changesets | |
87 | 1 new orphan changesets |
|
88 | 1 new orphan changesets | |
88 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
|
89 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | |
|
90 | 1 new obsolescence markers | |||
89 | obsoleted 1 changesets |
|
91 | obsoleted 1 changesets | |
90 | $ hg log -G --hidden |
|
92 | $ hg log -G --hidden | |
91 | @ d70a1f75a020 (draft): B1 |
|
93 | @ d70a1f75a020 (draft): B1 |
@@ -72,9 +72,11 b' Test setup' | |||||
72 | $ mkcommit B1 |
|
72 | $ mkcommit B1 | |
73 | created new head |
|
73 | created new head | |
74 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` |
|
74 | $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | |
|
75 | 1 new obsolescence markers | |||
75 | obsoleted 1 changesets |
|
76 | obsoleted 1 changesets | |
76 | 1 new orphan changesets |
|
77 | 1 new orphan changesets | |
77 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
|
78 | $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` | |
|
79 | 1 new obsolescence markers | |||
78 | obsoleted 1 changesets |
|
80 | obsoleted 1 changesets | |
79 | $ hg log -G --hidden |
|
81 | $ hg log -G --hidden | |
80 | @ 25c56d33e4c4 (draft): B1 |
|
82 | @ 25c56d33e4c4 (draft): B1 |
@@ -56,8 +56,10 b' Test setup' | |||||
56 | $ mkcommit C0 |
|
56 | $ mkcommit C0 | |
57 | created new head |
|
57 | created new head | |
58 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` |
|
58 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` | |
|
59 | 1 new obsolescence markers | |||
59 | obsoleted 1 changesets |
|
60 | obsoleted 1 changesets | |
60 | $ hg debugobsolete --record-parents `getid "desc(A1)"` |
|
61 | $ hg debugobsolete --record-parents `getid "desc(A1)"` | |
|
62 | 1 new obsolescence markers | |||
61 | obsoleted 1 changesets |
|
63 | obsoleted 1 changesets | |
62 | $ hg log -G --hidden |
|
64 | $ hg log -G --hidden | |
63 | @ 0f88766e02d6 (draft): C0 |
|
65 | @ 0f88766e02d6 (draft): C0 |
@@ -65,10 +65,13 b' Test setup' | |||||
65 | $ mkcommit C0 |
|
65 | $ mkcommit C0 | |
66 | created new head |
|
66 | created new head | |
67 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` |
|
67 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` | |
|
68 | 1 new obsolescence markers | |||
68 | obsoleted 1 changesets |
|
69 | obsoleted 1 changesets | |
69 | $ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"` |
|
70 | $ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"` | |
|
71 | 1 new obsolescence markers | |||
70 | obsoleted 1 changesets |
|
72 | obsoleted 1 changesets | |
71 | $ hg debugobsolete --record-parents `getid "desc(A2)"` |
|
73 | $ hg debugobsolete --record-parents `getid "desc(A2)"` | |
|
74 | 1 new obsolescence markers | |||
72 | obsoleted 1 changesets |
|
75 | obsoleted 1 changesets | |
73 | $ hg log -G --hidden |
|
76 | $ hg log -G --hidden | |
74 | @ 0f88766e02d6 (draft): C0 |
|
77 | @ 0f88766e02d6 (draft): C0 |
@@ -1608,6 +1608,7 b' Creating changesets and markers' | |||||
1608 | $ ID_Q=`hg -R client-racy log -T '{node}\n' -r 'desc("C-Q")'` |
|
1608 | $ ID_Q=`hg -R client-racy log -T '{node}\n' -r 'desc("C-Q")'` | |
1609 | $ ID_V=`hg -R client-racy log -T '{node}\n' -r 'desc("C-V")'` |
|
1609 | $ ID_V=`hg -R client-racy log -T '{node}\n' -r 'desc("C-V")'` | |
1610 | $ hg -R client-racy debugobsolete $ID_Q $ID_V |
|
1610 | $ hg -R client-racy debugobsolete $ID_Q $ID_V | |
|
1611 | 1 new obsolescence markers | |||
1611 | obsoleted 1 changesets |
|
1612 | obsoleted 1 changesets | |
1612 |
|
1613 | |||
1613 | Pushing |
|
1614 | Pushing | |
@@ -1800,6 +1801,7 b' Creating changesets and markers' | |||||
1800 | $ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'` |
|
1801 | $ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'` | |
1801 | $ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'` |
|
1802 | $ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'` | |
1802 | $ hg -R client-other debugobsolete $ID_V $ID_W |
|
1803 | $ hg -R client-other debugobsolete $ID_V $ID_W | |
|
1804 | 1 new obsolescence markers | |||
1803 | obsoleted 1 changesets |
|
1805 | obsoleted 1 changesets | |
1804 |
|
1806 | |||
1805 | (continue the same head) |
|
1807 | (continue the same head) |
@@ -651,6 +651,7 b' Test hidden changesets in the rebase set' | |||||
651 | $ hg commit -m J |
|
651 | $ hg commit -m J | |
652 | 1 new orphan changesets |
|
652 | 1 new orphan changesets | |
653 | $ hg debugobsolete `hg log --rev . -T '{node}'` |
|
653 | $ hg debugobsolete `hg log --rev . -T '{node}'` | |
|
654 | 1 new obsolescence markers | |||
654 | obsoleted 1 changesets |
|
655 | obsoleted 1 changesets | |
655 |
|
656 | |||
656 | $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off |
|
657 | $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off | |
@@ -838,6 +839,7 b' Even when the chain include missing node' | |||||
838 | o 0:4a2df7238c3b A |
|
839 | o 0:4a2df7238c3b A | |
839 |
|
840 | |||
840 | $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true |
|
841 | $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true | |
|
842 | 1 new obsolescence markers | |||
841 | obsoleted 1 changesets |
|
843 | obsoleted 1 changesets | |
842 | 1 new orphan changesets |
|
844 | 1 new orphan changesets | |
843 | $ hg rebase -d 6 -r "4::" |
|
845 | $ hg rebase -d 6 -r "4::" | |
@@ -867,6 +869,7 b' should display a friendly error message' | |||||
867 | $ hg commit -m nonrelevant |
|
869 | $ hg commit -m nonrelevant | |
868 | created new head |
|
870 | created new head | |
869 | $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true |
|
871 | $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true | |
|
872 | 1 new obsolescence markers | |||
870 | obsoleted 1 changesets |
|
873 | obsoleted 1 changesets | |
871 | $ hg log -G |
|
874 | $ hg log -G | |
872 | @ 11:f44da1f4954c nonrelevant (pruned) |
|
875 | @ 11:f44da1f4954c nonrelevant (pruned) | |
@@ -1007,6 +1010,7 b' Create the changes that we will rebase' | |||||
1007 | $ hg add L |
|
1010 | $ hg add L | |
1008 | $ hg commit -m "dummy change" |
|
1011 | $ hg commit -m "dummy change" | |
1009 | $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true |
|
1012 | $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true | |
|
1013 | 1 new obsolescence markers | |||
1010 | obsoleted 1 changesets |
|
1014 | obsoleted 1 changesets | |
1011 | 1 new orphan changesets |
|
1015 | 1 new orphan changesets | |
1012 |
|
1016 | |||
@@ -1276,6 +1280,7 b' issue5782' | |||||
1276 | > EOF |
|
1280 | > EOF | |
1277 | 1 new orphan changesets |
|
1281 | 1 new orphan changesets | |
1278 | $ hg debugobsolete `hg log -T "{node}" --hidden -r 'desc("c1")'` |
|
1282 | $ hg debugobsolete `hg log -T "{node}" --hidden -r 'desc("c1")'` | |
|
1283 | 1 new obsolescence markers | |||
1279 | obsoleted 1 changesets |
|
1284 | obsoleted 1 changesets | |
1280 | $ hg log -G -r 'a': --hidden |
|
1285 | $ hg log -G -r 'a': --hidden | |
1281 | * 4:76be324c128b d |
|
1286 | * 4:76be324c128b d |
@@ -2003,6 +2003,7 b" Test short 'ff...' hash collision" | |||||
2003 | 4:ffff85cff0ff78504fcdc3c0bc10de0c65379249 ffff8 |
|
2003 | 4:ffff85cff0ff78504fcdc3c0bc10de0c65379249 ffff8 | |
2004 | 2147483647:ffffffffffffffffffffffffffffffffffffffff fffff |
|
2004 | 2147483647:ffffffffffffffffffffffffffffffffffffffff fffff | |
2005 | $ hg debugobsolete fffbae3886c8fbb2114296380d276fd37715d571 |
|
2005 | $ hg debugobsolete fffbae3886c8fbb2114296380d276fd37715d571 | |
|
2006 | 1 new obsolescence markers | |||
2006 | obsoleted 1 changesets |
|
2007 | obsoleted 1 changesets | |
2007 |
|
2008 | |||
2008 | $ hg debugrevspec 'fff' |
|
2009 | $ hg debugrevspec 'fff' |
@@ -112,6 +112,7 b' test bug 4073 we need to enable obsolete' | |||||
112 | shelved as default |
|
112 | shelved as default | |
113 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
113 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
114 | $ hg debugobsolete `hg log -r 0e067c57feba -T '{node}'` |
|
114 | $ hg debugobsolete `hg log -r 0e067c57feba -T '{node}'` | |
|
115 | 1 new obsolescence markers | |||
115 | obsoleted 1 changesets |
|
116 | obsoleted 1 changesets | |
116 | $ hg unshelve |
|
117 | $ hg unshelve | |
117 | unshelving change 'default' |
|
118 | unshelving change 'default' |
@@ -235,6 +235,7 b' Obsolescence information appears in labe' | |||||
235 | > evolution=createmarkers |
|
235 | > evolution=createmarkers | |
236 | > EOF |
|
236 | > EOF | |
237 | $ hg debugobsolete `hg log -r 'desc("commit 2")' -T "{node}"` |
|
237 | $ hg debugobsolete `hg log -r 'desc("commit 2")' -T "{node}"` | |
|
238 | 1 new obsolescence markers | |||
238 | obsoleted 1 changesets |
|
239 | obsoleted 1 changesets | |
239 | 1 new orphan changesets |
|
240 | 1 new orphan changesets | |
240 | $ hg show work --color=debug |
|
241 | $ hg show work --color=debug |
@@ -434,6 +434,7 b' issue5539: pruned tags do not appear in ' | |||||
434 | abeb261f0508ecebcd345ce21e7a25112df417aa |
|
434 | abeb261f0508ecebcd345ce21e7a25112df417aa | |
435 | (mimic 'hg prune' command by obsoleting current changeset and then moving to its parent) |
|
435 | (mimic 'hg prune' command by obsoleting current changeset and then moving to its parent) | |
436 | $ hg debugobsolete abeb261f0508ecebcd345ce21e7a25112df417aa --record-parents |
|
436 | $ hg debugobsolete abeb261f0508ecebcd345ce21e7a25112df417aa --record-parents | |
|
437 | 1 new obsolescence markers | |||
437 | obsoleted 1 changesets |
|
438 | obsoleted 1 changesets | |
438 | $ hg up ".^" --quiet |
|
439 | $ hg up ".^" --quiet | |
439 | $ cat .hgtags |
|
440 | $ cat .hgtags |
@@ -918,10 +918,13 b' Test shortest(node) with the repo having' | |||||
918 | 9:c5623987d205cd6d9d8389bfc40fff9dbb670b48 |
|
918 | 9:c5623987d205cd6d9d8389bfc40fff9dbb670b48 | |
919 | 10:c562ddd9c94164376c20b86b0b4991636a3bf84f |
|
919 | 10:c562ddd9c94164376c20b86b0b4991636a3bf84f | |
920 | $ hg debugobsolete a00be79088084cb3aff086ab799f8790e01a976b |
|
920 | $ hg debugobsolete a00be79088084cb3aff086ab799f8790e01a976b | |
|
921 | 1 new obsolescence markers | |||
921 | obsoleted 1 changesets |
|
922 | obsoleted 1 changesets | |
922 | $ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48 |
|
923 | $ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48 | |
|
924 | 1 new obsolescence markers | |||
923 | obsoleted 1 changesets |
|
925 | obsoleted 1 changesets | |
924 | $ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f |
|
926 | $ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f | |
|
927 | 1 new obsolescence markers | |||
925 | obsoleted 1 changesets |
|
928 | obsoleted 1 changesets | |
926 |
|
929 | |||
927 | nodes starting with '11' (we don't have the revision number '11' though) |
|
930 | nodes starting with '11' (we don't have the revision number '11' though) | |
@@ -987,6 +990,7 b' Test prefixhexnode when the first charac' | |||||
987 | 1:x0 |
|
990 | 1:x0 | |
988 |
|
991 | |||
989 | $ hg debugobsolete 0cf177ba2b1dc3862a00fb81715fec90950201be |
|
992 | $ hg debugobsolete 0cf177ba2b1dc3862a00fb81715fec90950201be | |
|
993 | 1 new obsolescence markers | |||
990 | obsoleted 1 changesets |
|
994 | obsoleted 1 changesets | |
991 | $ hg up -q 0 |
|
995 | $ hg up -q 0 | |
992 | $ echo 61 > a |
|
996 | $ echo 61 > a |
@@ -502,8 +502,10 b' We add simple obsolescence marker betwee' | |||||
502 | $ hg id --debug -i -r 4 |
|
502 | $ hg id --debug -i -r 4 | |
503 | d047485b3896813b2a624e86201983520f003206 |
|
503 | d047485b3896813b2a624e86201983520f003206 | |
504 | $ hg debugobsolete 6efa171f091b00a3c35edc15d48c52a498929953 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
|
504 | $ hg debugobsolete 6efa171f091b00a3c35edc15d48c52a498929953 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | |
|
505 | 1 new obsolescence markers | |||
505 | obsoleted 1 changesets |
|
506 | obsoleted 1 changesets | |
506 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa d047485b3896813b2a624e86201983520f003206 |
|
507 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa d047485b3896813b2a624e86201983520f003206 | |
|
508 | 1 new obsolescence markers | |||
507 |
|
509 | |||
508 | Test that 5 is detected as a valid destination from 3 and also accepts moving |
|
510 | Test that 5 is detected as a valid destination from 3 and also accepts moving | |
509 | the bookmark (issue4015) |
|
511 | the bookmark (issue4015) | |
@@ -575,6 +577,7 b' non-obsolete parent but that will be dec' | |||||
575 | $ hg up --quiet 0 |
|
577 | $ hg up --quiet 0 | |
576 | $ hg up --quiet 2 |
|
578 | $ hg up --quiet 2 | |
577 | $ hg debugobsolete bd10386d478cd5a9faf2e604114c8e6da62d3889 |
|
579 | $ hg debugobsolete bd10386d478cd5a9faf2e604114c8e6da62d3889 | |
|
580 | 1 new obsolescence markers | |||
578 | obsoleted 1 changesets |
|
581 | obsoleted 1 changesets | |
579 | $ hg up |
|
582 | $ hg up | |
580 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
583 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now