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