##// END OF EJS Templates
debugobsolete: also report the number of obsoleted changesets...
Boris Feld -
r33542:b11e8c67 default
parent child Browse files
Show More
@@ -1081,6 +1081,7 b' class simplekeyvaluefile(object):'
1081 fp.write(''.join(lines))
1081 fp.write(''.join(lines))
1082
1082
1083 _reportobsoletedsource = [
1083 _reportobsoletedsource = [
1084 'debugobsolete',
1084 'pull',
1085 'pull',
1085 'push',
1086 'push',
1086 'serve',
1087 'serve',
@@ -572,6 +572,7 b' tip is obsolete'
572 ---------------------
572 ---------------------
573
573
574 $ hg debugobsolete `hg id --debug -i -r tip`
574 $ hg debugobsolete `hg id --debug -i -r tip`
575 obsoleted 1 changesets
575 $ hg bisect --reset
576 $ hg bisect --reset
576 $ hg bisect --good 15
577 $ hg bisect --good 15
577 $ hg bisect --bad 30
578 $ hg bisect --bad 30
@@ -475,6 +475,7 b' Update to a successor works'
475 $ hg id --debug -r 5
475 $ hg id --debug -r 5
476 c922c0139ca03858f655e4a2af4dd02796a63969 tip Y
476 c922c0139ca03858f655e4a2af4dd02796a63969 tip Y
477 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc
477 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc
478 obsoleted 1 changesets
478 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f
479 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f
479 $ hg push http://localhost:$HGPORT2/
480 $ hg push http://localhost:$HGPORT2/
480 pushing to http://localhost:$HGPORT2/
481 pushing to http://localhost:$HGPORT2/
@@ -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 obsoleted 1 changesets
27
28
28 $ hg phase -pr t1
29 $ hg phase -pr t1
29 $ hg phase -fsr t2
30 $ hg phase -fsr t2
@@ -714,6 +714,7 b' Create repositories to test auto sharing'
714 $ echo initial2 > foo
714 $ echo initial2 > foo
715 $ hg -q commit -A -m initial1
715 $ hg -q commit -A -m initial1
716 $ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8
716 $ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8
717 obsoleted 1 changesets
717 $ cd ..
718 $ cd ..
718
719
719 $ hg -q clone --pull source1a source1b
720 $ hg -q clone --pull source1a source1b
@@ -3590,8 +3590,11 b' Test shortest(node) with the repo having'
3590 9:c5623987d205cd6d9d8389bfc40fff9dbb670b48
3590 9:c5623987d205cd6d9d8389bfc40fff9dbb670b48
3591 10:c562ddd9c94164376c20b86b0b4991636a3bf84f
3591 10:c562ddd9c94164376c20b86b0b4991636a3bf84f
3592 $ hg debugobsolete a00be79088084cb3aff086ab799f8790e01a976b
3592 $ hg debugobsolete a00be79088084cb3aff086ab799f8790e01a976b
3593 obsoleted 1 changesets
3593 $ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48
3594 $ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48
3595 obsoleted 1 changesets
3594 $ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f
3596 $ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f
3597 obsoleted 1 changesets
3595
3598
3596 nodes starting with '11' (we don't have the revision number '11' though)
3599 nodes starting with '11' (we don't have the revision number '11' though)
3597
3600
@@ -515,6 +515,7 b' changelog and manifest would have invali'
515 *** runcommand up null
515 *** runcommand up null
516 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
516 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
517 *** runcommand phase -df tip
517 *** runcommand phase -df tip
518 obsoleted 1 changesets
518 *** runcommand log --hidden
519 *** runcommand log --hidden
519 changeset: 1:731265503d86
520 changeset: 1:731265503d86
520 tag: tip
521 tag: tip
@@ -73,7 +73,9 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 obsoleted 1 changesets
76 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
77 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
78 obsoleted 1 changesets
77 $ hg log -G --hidden
79 $ hg log -G --hidden
78 @ f6298a8ac3a4 (draft): B1
80 @ f6298a8ac3a4 (draft): B1
79 |
81 |
@@ -159,7 +161,9 b' other variant: changeset known in remote'
159 $ mkcommit B1
161 $ mkcommit B1
160 created new head
162 created new head
161 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
163 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
164 obsoleted 1 changesets
162 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
165 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
166 obsoleted 1 changesets
163 $ hg log -G --hidden
167 $ hg log -G --hidden
164 @ f6298a8ac3a4 (draft): B1
168 @ f6298a8ac3a4 (draft): B1
165 |
169 |
@@ -64,6 +64,7 b' initial'
64 created new head
64 created new head
65 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
65 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
67 obsoleted 1 changesets
67 $ hg log -G --hidden
68 $ hg log -G --hidden
68 @ e5ea8f9c7314 (draft): A1
69 @ e5ea8f9c7314 (draft): A1
69 |
70 |
@@ -66,7 +66,9 b' initial'
66 $ mkcommit A1
66 $ mkcommit A1
67 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
67 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
68 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
68 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
69 obsoleted 1 changesets
69 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
70 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
71 obsoleted 1 changesets
70 $ hg log -G --hidden
72 $ hg log -G --hidden
71 @ 8c0a98c83722 (draft): A1
73 @ 8c0a98c83722 (draft): A1
72 |
74 |
@@ -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 obsoleted 1 changesets
67 $ hg log -G --hidden
68 $ hg log -G --hidden
68 @ e5ea8f9c7314 (draft): A1
69 @ e5ea8f9c7314 (draft): A1
69 |
70 |
@@ -70,8 +70,10 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 obsoleted 1 changesets
73 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
74 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
74 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
75 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
76 obsoleted 1 changesets
75 $ hg prune -qd '0 0' 'desc(B1)'
77 $ hg prune -qd '0 0' 'desc(B1)'
76 $ hg log -G --hidden
78 $ hg log -G --hidden
77 x 069b05c3876d (draft): B1
79 x 069b05c3876d (draft): B1
@@ -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 obsoleted 1 changesets
60 $ hg prune -qd '0 0' .
61 $ hg prune -qd '0 0' .
61 $ hg log -G --hidden
62 $ hg log -G --hidden
62 x f6298a8ac3a4 (draft): B1
63 x f6298a8ac3a4 (draft): B1
@@ -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 obsoleted 1 changesets
65 $ hg log -G --hidden
66 $ hg log -G --hidden
66 @ e5ea8f9c7314 (draft): A1
67 @ e5ea8f9c7314 (draft): A1
67 |
68 |
@@ -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 obsoleted 1 changesets
67 $ hg prune -qd '0 0' .
68 $ hg prune -qd '0 0' .
68 $ hg log -G --hidden
69 $ hg log -G --hidden
69 x e5ea8f9c7314 (draft): A1
70 x e5ea8f9c7314 (draft): A1
@@ -65,6 +65,7 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 obsoleted 1 changesets
68 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
69 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
69 $ hg prune -qd '0 0' .
70 $ hg prune -qd '0 0' .
70 $ hg log -G --hidden
71 $ hg log -G --hidden
@@ -61,7 +61,9 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 obsoleted 1 changesets
64 $ hg prune -d '0 0' 'desc(B)'
65 $ hg prune -d '0 0' 'desc(B)'
66 obsoleted 1 changesets
65 $ hg strip --hidden -q 'desc(A0)'
67 $ hg strip --hidden -q 'desc(A0)'
66 $ hg log -G --hidden
68 $ hg log -G --hidden
67 @ e5ea8f9c7314 (draft): A1
69 @ e5ea8f9c7314 (draft): A1
@@ -54,7 +54,9 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 obsoleted 1 changesets
57 $ hg prune --date '0 0' .
58 $ hg prune --date '0 0' .
59 obsoleted 1 changesets
58 $ hg strip --hidden -q 'desc(A1)'
60 $ hg strip --hidden -q 'desc(A1)'
59 $ hg log -G --hidden
61 $ hg log -G --hidden
60 x 28b51eb45704 (draft): A0
62 x 28b51eb45704 (draft): A0
@@ -57,7 +57,9 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 obsoleted 1 changesets
60 $ hg prune -d '0 0' .
61 $ hg prune -d '0 0' .
62 obsoleted 1 changesets
61 $ hg strip --hidden -q 'desc(A1)'
63 $ hg strip --hidden -q 'desc(A1)'
62 $ hg log -G --hidden
64 $ hg log -G --hidden
63 @ 35b183996678 (draft): B
65 @ 35b183996678 (draft): B
@@ -59,8 +59,10 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 obsoleted 1 changesets
62 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
63 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
63 $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
64 $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
65 obsoleted 1 changesets
64 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'`
66 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'`
65 $ hg log -G --hidden
67 $ hg log -G --hidden
66 @ 069b05c3876d (draft): B1
68 @ 069b05c3876d (draft): B1
@@ -2294,6 +2294,7 b' Test --hidden'
2294 > EOF
2294 > EOF
2295
2295
2296 $ hg debugobsolete `hg id --debug -i -r 8`
2296 $ hg debugobsolete `hg id --debug -i -r 8`
2297 obsoleted 1 changesets
2297 $ testlog
2298 $ testlog
2298 []
2299 []
2299 []
2300 []
@@ -329,6 +329,7 b' process.'
329 > evolution=createmarkers
329 > evolution=createmarkers
330 > EOF
330 > EOF
331 $ hg debugobsolete `hg log -r tip -T "{node}"`
331 $ hg debugobsolete `hg log -r tip -T "{node}"`
332 obsoleted 1 changesets
332 $ cd ..
333 $ cd ..
333
334
334 $ hg -R largefiles-repo-hg verify --large --lfa
335 $ hg -R largefiles-repo-hg verify --large --lfa
@@ -1707,6 +1707,7 b' enable obsolete to test hidden feature'
1707 1:a765632148dc55d38c35c4f247c618701886cb2f
1707 1:a765632148dc55d38c35c4f247c618701886cb2f
1708 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1708 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1709 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
1709 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
1710 obsoleted 1 changesets
1710 $ hg up null -q
1711 $ hg up null -q
1711 $ hg log --template='{rev}:{node}\n'
1712 $ hg log --template='{rev}:{node}\n'
1712 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1713 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
@@ -1754,6 +1755,7 b' test hidden revision 0 (issue5385)'
1754 $ hg bookmark -d X@foo
1755 $ hg bookmark -d X@foo
1755 $ hg up null -q
1756 $ hg up null -q
1756 $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1757 $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1758 obsoleted 1 changesets
1757 $ echo f > b
1759 $ echo f > b
1758 $ hg ci -Am'b' -d '2 0'
1760 $ hg ci -Am'b' -d '2 0'
1759 adding b
1761 adding b
@@ -2207,6 +2209,7 b' Test that we use the first non-hidden ch'
2207 $ hg log -T '{node}\n' -r 1
2209 $ hg log -T '{node}\n' -r 1
2208 2294ae80ad8447bc78383182eeac50cb049df623
2210 2294ae80ad8447bc78383182eeac50cb049df623
2209 $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
2211 $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
2212 obsoleted 1 changesets
2210 $ hg log -G
2213 $ hg log -G
2211 o changeset: 4:50b9b36e9c5d
2214 o changeset: 4:50b9b36e9c5d
2212 | tag: tip
2215 | tag: tip
@@ -2256,6 +2259,7 b' Even when a head revision is linkrev-sha'
2256 $ hg log -T '{node}\n' -r 4
2259 $ hg log -T '{node}\n' -r 4
2257 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
2260 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
2258 $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
2261 $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
2262 obsoleted 1 changesets
2259 $ hg log -G a
2263 $ hg log -G a
2260 @ changeset: 3:15b2327059e5
2264 @ changeset: 3:15b2327059e5
2261 : tag: tip
2265 : tag: tip
@@ -190,6 +190,7 b' Test templates with splitted commit'
190 $ hg commit -A -m "A0"
190 $ hg commit -A -m "A0"
191 adding b
191 adding b
192 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
192 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
193 obsoleted 1 changesets
193
194
194 $ hg log --hidden -G
195 $ hg log --hidden -G
195 @ changeset: 3:f257fde29c7a
196 @ changeset: 3:f257fde29c7a
@@ -307,7 +308,9 b' Simulate a fold'
307 adding B0
308 adding B0
308 created new head
309 created new head
309 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
310 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
311 obsoleted 1 changesets
310 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
312 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
313 obsoleted 1 changesets
311
314
312 $ hg log --hidden -G
315 $ hg log --hidden -G
313 @ changeset: 3:eb5a0daa2192
316 @ changeset: 3:eb5a0daa2192
@@ -604,7 +607,9 b' Test setup'
604 adding B0
607 adding B0
605 created new head
608 created new head
606 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
609 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
610 obsoleted 1 changesets
607 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
611 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
612 obsoleted 1 changesets
608
613
609 $ hg log --hidden -G
614 $ hg log --hidden -G
610 @ changeset: 4:eb5a0daa2192
615 @ changeset: 4:eb5a0daa2192
@@ -876,7 +881,9 b' Test setup'
876 Create the cycle
881 Create the cycle
877
882
878 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
883 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
884 obsoleted 1 changesets
879 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
885 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
886 obsoleted 1 changesets
880 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
887 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
881
888
882 Check templates
889 Check templates
@@ -1033,6 +1040,7 b' Split it'
1033 summary: ROOT
1040 summary: ROOT
1034
1041
1035 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
1042 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
1043 obsoleted 1 changesets
1036 $ hg log -G
1044 $ hg log -G
1037 @ changeset: 7:ba2ed02b0c9a
1045 @ changeset: 7:ba2ed02b0c9a
1038 | tag: tip
1046 | tag: tip
@@ -1248,6 +1256,7 b' Test setup'
1248 $ mkcommit ROOT
1256 $ mkcommit ROOT
1249 $ mkcommit A0
1257 $ mkcommit A0
1250 $ hg debugobsolete --record-parent `getid "."`
1258 $ hg debugobsolete --record-parent `getid "."`
1259 obsoleted 1 changesets
1251
1260
1252 Check output
1261 Check output
1253 ------------
1262 ------------
@@ -127,6 +127,7 b' setup'
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 $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1
129 $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1
130 obsoleted 1 changesets
130 $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'`
131 $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'`
131
132
132 $ hg up 'desc("ROOT")'
133 $ hg up 'desc("ROOT")'
@@ -268,7 +269,9 b' setup'
268 created new head
269 created new head
269 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
270 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
270 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
271 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
272 obsoleted 1 changesets
271 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
273 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
274 obsoleted 1 changesets
272 $ hg up 'desc("ROOT")'
275 $ hg up 'desc("ROOT")'
273 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
276 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
274 $ hg log --hidden -G
277 $ hg log --hidden -G
@@ -450,6 +453,7 b' setup'
450 created new head
453 created new head
451 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
454 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
452 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
455 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
456 obsoleted 1 changesets
453 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
457 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
454 $ hg up 'desc("ROOT")'
458 $ hg up 'desc("ROOT")'
455 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
459 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -590,7 +594,9 b' setup'
590 created new head
594 created new head
591 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
595 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
592 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
596 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
597 obsoleted 1 changesets
593 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
598 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
599 obsoleted 1 changesets
594
600
595 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
601 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
596
602
@@ -668,6 +674,7 b' setup'
668 created new head
674 created new head
669 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
675 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
670 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
676 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
677 obsoleted 1 changesets
671 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
678 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
672
679
673 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
680 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
@@ -753,12 +760,16 b' setup'
753 created new head
760 created new head
754 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'`
761 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'`
755 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split
762 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split
763 obsoleted 1 changesets
756 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent
764 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent
757 $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0
765 $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0
758 $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'`
766 $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'`
759 $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'`
767 $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'`
768 obsoleted 1 changesets
760 $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'`
769 $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'`
770 obsoleted 1 changesets
761 $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'`
771 $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'`
772 obsoleted 1 changesets
762 $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'`
773 $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'`
763
774
764 $ hg up 'desc("ROOT")'
775 $ hg up 'desc("ROOT")'
@@ -1289,6 +1300,7 b' setup'
1289 $ mkcommit 'C-A'
1300 $ mkcommit 'C-A'
1290 $ mkcommit 'C-B'
1301 $ mkcommit 'C-B'
1291 $ hg debugobsolete --record-parent `getid 'desc("C-B")'`
1302 $ hg debugobsolete --record-parent `getid 'desc("C-B")'`
1303 obsoleted 1 changesets
1292
1304
1293 $ hg up 'desc("ROOT")'
1305 $ hg up 'desc("ROOT")'
1294 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1306 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -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 obsoleted 1 changesets
37
38
38 Push it. The bundle should not refer to the extinct changeset.
39 Push it. The bundle should not refer to the extinct changeset.
39
40
@@ -132,6 +133,7 b' server obsoletes the old head'
132 $ echo 2b > foo
133 $ echo 2b > foo
133 $ hg -q commit -m 2b
134 $ hg -q commit -m 2b
134 $ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129
135 $ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129
136 obsoleted 1 changesets
135 $ cd ..
137 $ cd ..
136
138
137 client only pulls down 1 changeset
139 client only pulls down 1 changeset
@@ -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 obsoleted 1 changesets
50 $ hg log -G --hidden
51 $ hg log -G --hidden
51 @ 71e3228bffe1 (draft) add new
52 @ 71e3228bffe1 (draft) add new
52 |
53 |
@@ -188,6 +189,7 b' setup. (The obsolete marker is known loc'
188 $ mkcommit desc2
189 $ mkcommit desc2
189 created new head
190 created new head
190 $ hg debugobsolete `getid old` `getid new`
191 $ hg debugobsolete `getid old` `getid new`
192 obsoleted 1 changesets
191 $ hg log -G --hidden
193 $ hg log -G --hidden
192 @ 5fe37041cc2b (draft) add desc2
194 @ 5fe37041cc2b (draft) add desc2
193 |
195 |
@@ -296,6 +298,7 b' setup'
296 $ mkcommit new-unrelated
298 $ mkcommit new-unrelated
297 created new head
299 created new head
298 $ hg debugobsolete `getid old`
300 $ hg debugobsolete `getid old`
301 obsoleted 1 changesets
299 $ hg log -G --hidden
302 $ hg log -G --hidden
300 @ 350a93b716be (draft) add new-unrelated
303 @ 350a93b716be (draft) add new-unrelated
301 |
304 |
@@ -59,6 +59,7 b' A_1 have two direct and divergent succes'
59
59
60 $ newcase direct
60 $ newcase direct
61 $ hg debugobsolete `getid A_0` `getid A_1`
61 $ hg debugobsolete `getid A_0` `getid A_1`
62 obsoleted 1 changesets
62 $ hg debugobsolete `getid A_0` `getid A_2`
63 $ hg debugobsolete `getid A_0` `getid A_2`
63 $ hg log -G --hidden
64 $ hg log -G --hidden
64 o 3:392fd25390da A_2
65 o 3:392fd25390da A_2
@@ -117,10 +118,12 b' indirect divergence with known changeset'
117
118
118 $ newcase indirect_known
119 $ newcase indirect_known
119 $ hg debugobsolete `getid A_0` `getid A_1`
120 $ hg debugobsolete `getid A_0` `getid A_1`
121 obsoleted 1 changesets
120 $ hg debugobsolete `getid A_0` `getid A_2`
122 $ hg debugobsolete `getid A_0` `getid A_2`
121 $ mkcommit A_3
123 $ mkcommit A_3
122 created new head
124 created new head
123 $ hg debugobsolete `getid A_2` `getid A_3`
125 $ hg debugobsolete `getid A_2` `getid A_3`
126 obsoleted 1 changesets
124 $ hg log -G --hidden
127 $ hg log -G --hidden
125 @ 4:01f36c5a8fda A_3
128 @ 4:01f36c5a8fda A_3
126 |
129 |
@@ -174,6 +177,7 b' indirect divergence with known changeset'
174
177
175 $ newcase indirect_unknown
178 $ newcase indirect_unknown
176 $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
179 $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
180 obsoleted 1 changesets
177 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
181 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
178 $ hg debugobsolete `getid A_0` `getid A_2`
182 $ hg debugobsolete `getid A_0` `getid A_2`
179 $ hg log -G --hidden
183 $ hg log -G --hidden
@@ -222,7 +226,9 b' do not take unknown node in account if t'
222
226
223 $ newcase final-unknown
227 $ newcase final-unknown
224 $ hg debugobsolete `getid A_0` `getid A_1`
228 $ hg debugobsolete `getid A_0` `getid A_1`
229 obsoleted 1 changesets
225 $ hg debugobsolete `getid A_1` `getid A_2`
230 $ hg debugobsolete `getid A_1` `getid A_2`
231 obsoleted 1 changesets
226 $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
232 $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
227 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
233 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
228 $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
234 $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
@@ -242,11 +248,14 b' divergence that converge again is not di'
242
248
243 $ newcase converged_divergence
249 $ newcase converged_divergence
244 $ hg debugobsolete `getid A_0` `getid A_1`
250 $ hg debugobsolete `getid A_0` `getid A_1`
251 obsoleted 1 changesets
245 $ hg debugobsolete `getid A_0` `getid A_2`
252 $ hg debugobsolete `getid A_0` `getid A_2`
246 $ mkcommit A_3
253 $ mkcommit A_3
247 created new head
254 created new head
248 $ hg debugobsolete `getid A_1` `getid A_3`
255 $ hg debugobsolete `getid A_1` `getid A_3`
256 obsoleted 1 changesets
249 $ hg debugobsolete `getid A_2` `getid A_3`
257 $ hg debugobsolete `getid A_2` `getid A_3`
258 obsoleted 1 changesets
250 $ hg log -G --hidden
259 $ hg log -G --hidden
251 @ 4:01f36c5a8fda A_3
260 @ 4:01f36c5a8fda A_3
252 |
261 |
@@ -294,6 +303,7 b' split is not divergences'
294
303
295 $ newcase split
304 $ newcase split
296 $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
305 $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
306 obsoleted 1 changesets
297 $ hg log -G --hidden
307 $ hg log -G --hidden
298 o 3:392fd25390da A_2
308 o 3:392fd25390da A_2
299 |
309 |
@@ -335,16 +345,19 b' Even when subsequent rewriting happen'
335 $ mkcommit A_3
345 $ mkcommit A_3
336 created new head
346 created new head
337 $ hg debugobsolete `getid A_1` `getid A_3`
347 $ hg debugobsolete `getid A_1` `getid A_3`
348 obsoleted 1 changesets
338 $ hg up 0
349 $ hg up 0
339 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
350 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
340 $ mkcommit A_4
351 $ mkcommit A_4
341 created new head
352 created new head
342 $ hg debugobsolete `getid A_2` `getid A_4`
353 $ hg debugobsolete `getid A_2` `getid A_4`
354 obsoleted 1 changesets
343 $ hg up 0
355 $ hg up 0
344 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
356 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
345 $ mkcommit A_5
357 $ mkcommit A_5
346 created new head
358 created new head
347 $ hg debugobsolete `getid A_4` `getid A_5`
359 $ hg debugobsolete `getid A_4` `getid A_5`
360 obsoleted 1 changesets
348 $ hg log -G --hidden
361 $ hg log -G --hidden
349 @ 6:e442cfc57690 A_5
362 @ 6:e442cfc57690 A_5
350 |
363 |
@@ -404,6 +417,7 b' Check more complex obsolescence graft (w'
404 $ mkcommit B_0; hg up 0
417 $ mkcommit B_0; hg up 0
405 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
418 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
406 $ hg debugobsolete `getid B_0` `getid A_2`
419 $ hg debugobsolete `getid B_0` `getid A_2`
420 obsoleted 1 changesets
407 $ mkcommit A_7; hg up 0
421 $ mkcommit A_7; hg up 0
408 created new head
422 created new head
409 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
423 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -411,6 +425,7 b' Check more complex obsolescence graft (w'
411 created new head
425 created new head
412 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
426 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
413 $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8`
427 $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8`
428 obsoleted 1 changesets
414 $ mkcommit A_9; hg up 0
429 $ mkcommit A_9; hg up 0
415 created new head
430 created new head
416 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
431 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -512,8 +527,11 b' fix the divergence'
512 created new head
527 created new head
513 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
528 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
514 $ hg debugobsolete `getid A_9` `getid A_A`
529 $ hg debugobsolete `getid A_9` `getid A_A`
530 obsoleted 1 changesets
515 $ hg debugobsolete `getid A_7` `getid A_A`
531 $ hg debugobsolete `getid A_7` `getid A_A`
532 obsoleted 1 changesets
516 $ hg debugobsolete `getid A_8` `getid A_A`
533 $ hg debugobsolete `getid A_8` `getid A_A`
534 obsoleted 1 changesets
517 $ hg log -G --hidden
535 $ hg log -G --hidden
518 o 11:a139f71be9da A_A
536 o 11:a139f71be9da A_A
519 |
537 |
@@ -609,6 +627,7 b' successors-set. (report [A,B] not [A] + '
609
627
610 $ newcase subset
628 $ newcase subset
611 $ hg debugobsolete `getid A_0` `getid A_2`
629 $ hg debugobsolete `getid A_0` `getid A_2`
630 obsoleted 1 changesets
612 $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
631 $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
613 $ hg debugsuccessorssets --hidden 'desc('A_0')'
632 $ hg debugsuccessorssets --hidden 'desc('A_0')'
614 007dc284c1f8
633 007dc284c1f8
@@ -56,6 +56,7 b' Trigger tags cache population by doing s'
56 Hiding a non-tip changeset should change filtered hash and cause tags recompute
56 Hiding a non-tip changeset should change filtered hash and cause tags recompute
57
57
58 $ hg debugobsolete -d '0 0' c3cb30f2d2cd0aae008cc91a07876e3c5131fd22 -u dummyuser
58 $ hg debugobsolete -d '0 0' c3cb30f2d2cd0aae008cc91a07876e3c5131fd22 -u dummyuser
59 obsoleted 1 changesets
59
60
60 $ hg tags
61 $ hg tags
61 tip 5:2942a772f72a
62 tip 5:2942a772f72a
@@ -77,7 +78,9 b' Hiding a non-tip changeset should change'
77 Hiding another changeset should cause the filtered hash to change
78 Hiding another changeset should cause the filtered hash to change
78
79
79 $ hg debugobsolete -d '0 0' d75775ffbc6bca1794d300f5571272879bd280da -u dummyuser
80 $ hg debugobsolete -d '0 0' d75775ffbc6bca1794d300f5571272879bd280da -u dummyuser
81 obsoleted 1 changesets
80 $ hg debugobsolete -d '0 0' 5f97d42da03fd56f3b228b03dfe48af5c0adf75b -u dummyuser
82 $ hg debugobsolete -d '0 0' 5f97d42da03fd56f3b228b03dfe48af5c0adf75b -u dummyuser
83 obsoleted 1 changesets
81
84
82 $ hg tags
85 $ hg tags
83 tip 5:2942a772f72a
86 tip 5:2942a772f72a
@@ -51,6 +51,7 b' Killing a single changeset without repla'
51 abort: changeset references must be full hexadecimal node identifiers
51 abort: changeset references must be full hexadecimal node identifiers
52 [255]
52 [255]
53 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
53 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
54 obsoleted 1 changesets
54 $ hg debugobsolete
55 $ hg debugobsolete
55 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}
56 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}
56
57
@@ -84,6 +85,7 b' Killing a single changeset with replacem'
84 created new head
85 created new head
85 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
86 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
86 $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120'
87 $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120'
88 obsoleted 1 changesets
87 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
89 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
88 2:245bde4270cd add original_c
90 2:245bde4270cd add original_c
89 $ hg debugrevlog -cd
91 $ hg debugrevlog -cd
@@ -107,6 +109,7 b' do it again (it read the obsstore before'
107 $ mkcommit new_2_c
109 $ mkcommit new_2_c
108 created new head
110 created new head
109 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
111 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
112 obsoleted 1 changesets
110 $ hg debugobsolete
113 $ hg debugobsolete
111 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
114 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
112 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
115 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
@@ -118,6 +121,7 b' Register two markers with a missing node'
118 $ mkcommit new_3_c
121 $ mkcommit new_3_c
119 created new head
122 created new head
120 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
123 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
124 obsoleted 1 changesets
121 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
125 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
122 $ hg debugobsolete
126 $ hg debugobsolete
123 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
127 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
@@ -256,6 +260,7 b' We need to create a clone of 5 and add a'
256 $ hg ci -m 'add n3w_3_c'
260 $ hg ci -m 'add n3w_3_c'
257 created new head
261 created new head
258 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
262 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
263 obsoleted 1 changesets
259 $ hg log -r 'bumped()'
264 $ hg log -r 'bumped()'
260 $ hg log -G
265 $ hg log -G
261 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
266 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
@@ -314,6 +319,7 b' Revision 0 is hidden'
314 $ mkcommit kill0
319 $ mkcommit kill0
315 $ hg up -q null
320 $ hg up -q null
316 $ hg debugobsolete `getid kill0`
321 $ hg debugobsolete `getid kill0`
322 obsoleted 1 changesets
317 $ mkcommit a
323 $ mkcommit a
318 $ mkcommit b
324 $ mkcommit b
319
325
@@ -508,6 +514,7 b' detect outgoing obsolete and unstable'
508 $ mkcommit original_d
514 $ mkcommit original_d
509 $ mkcommit original_e
515 $ mkcommit original_e
510 $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
516 $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
517 obsoleted 1 changesets
511 $ hg debugobsolete | grep `getid original_d`
518 $ hg debugobsolete | grep `getid original_d`
512 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
519 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
513 $ hg log -r 'obsolete()'
520 $ hg log -r 'obsolete()'
@@ -601,6 +608,7 b' Do not warn about new head when the new '
601 created new head
608 created new head
602 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \
609 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \
603 > -u 'test <test@example.net>'
610 > -u 'test <test@example.net>'
611 obsoleted 1 changesets
604 $ hg outgoing ../tmpf # parasite hg outgoing testin
612 $ hg outgoing ../tmpf # parasite hg outgoing testin
605 comparing with ../tmpf
613 comparing with ../tmpf
606 searching for changes
614 searching for changes
@@ -779,6 +787,66 b' check hgweb does not explode'
779 > do
787 > do
780 > hg debugobsolete $node
788 > hg debugobsolete $node
781 > done
789 > done
790 obsoleted 1 changesets
791 obsoleted 1 changesets
792 obsoleted 1 changesets
793 obsoleted 1 changesets
794 obsoleted 1 changesets
795 obsoleted 1 changesets
796 obsoleted 1 changesets
797 obsoleted 1 changesets
798 obsoleted 1 changesets
799 obsoleted 1 changesets
800 obsoleted 1 changesets
801 obsoleted 1 changesets
802 obsoleted 1 changesets
803 obsoleted 1 changesets
804 obsoleted 1 changesets
805 obsoleted 1 changesets
806 obsoleted 1 changesets
807 obsoleted 1 changesets
808 obsoleted 1 changesets
809 obsoleted 1 changesets
810 obsoleted 1 changesets
811 obsoleted 1 changesets
812 obsoleted 1 changesets
813 obsoleted 1 changesets
814 obsoleted 1 changesets
815 obsoleted 1 changesets
816 obsoleted 1 changesets
817 obsoleted 1 changesets
818 obsoleted 1 changesets
819 obsoleted 1 changesets
820 obsoleted 1 changesets
821 obsoleted 1 changesets
822 obsoleted 1 changesets
823 obsoleted 1 changesets
824 obsoleted 1 changesets
825 obsoleted 1 changesets
826 obsoleted 1 changesets
827 obsoleted 1 changesets
828 obsoleted 1 changesets
829 obsoleted 1 changesets
830 obsoleted 1 changesets
831 obsoleted 1 changesets
832 obsoleted 1 changesets
833 obsoleted 1 changesets
834 obsoleted 1 changesets
835 obsoleted 1 changesets
836 obsoleted 1 changesets
837 obsoleted 1 changesets
838 obsoleted 1 changesets
839 obsoleted 1 changesets
840 obsoleted 1 changesets
841 obsoleted 1 changesets
842 obsoleted 1 changesets
843 obsoleted 1 changesets
844 obsoleted 1 changesets
845 obsoleted 1 changesets
846 obsoleted 1 changesets
847 obsoleted 1 changesets
848 obsoleted 1 changesets
849 obsoleted 1 changesets
782 $ hg up tip
850 $ hg up tip
783 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
851 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
784
852
@@ -840,6 +908,7 b' reenable for later test'
840 Several troubles on the same changeset (create an unstable and bumped changeset)
908 Several troubles on the same changeset (create an unstable and bumped changeset)
841
909
842 $ hg debugobsolete `getid obsolete_e`
910 $ hg debugobsolete `getid obsolete_e`
911 obsoleted 1 changesets
843 $ hg debugobsolete `getid original_c` `getid babar`
912 $ hg debugobsolete `getid original_c` `getid babar`
844 $ hg log --config ui.logtemplate= -r 'bumped() and unstable()'
913 $ hg log --config ui.logtemplate= -r 'bumped() and unstable()'
845 changeset: 7:50c51b361e60
914 changeset: 7:50c51b361e60
@@ -1084,6 +1153,7 b' Test issue 4506'
1084 grafting 1:1c9eddb02162 "content-1" (tip)
1153 grafting 1:1c9eddb02162 "content-1" (tip)
1085
1154
1086 $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`
1155 $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`
1156 obsoleted 1 changesets
1087
1157
1088 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
1158 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
1089 $ cat hg.pid >> $DAEMON_PIDS
1159 $ cat hg.pid >> $DAEMON_PIDS
@@ -593,6 +593,7 b' test hidden changeset are not cloned as '
593
593
594 (making a changeset hidden; H in that case)
594 (making a changeset hidden; H in that case)
595 $ hg debugobsolete `hg id --debug -r 5`
595 $ hg debugobsolete `hg id --debug -r 5`
596 obsoleted 1 changesets
596
597
597 $ cd ..
598 $ cd ..
598 $ hg clone initialrepo clonewithobs
599 $ hg clone initialrepo clonewithobs
@@ -59,6 +59,7 b' Test setup'
59 $ mkcommit B1
59 $ mkcommit B1
60 created new head
60 created new head
61 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
61 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
62 obsoleted 1 changesets
62 $ hg log -G --hidden
63 $ hg log -G --hidden
63 @ 25c56d33e4c4 (draft): B1
64 @ 25c56d33e4c4 (draft): B1
64 |
65 |
@@ -59,6 +59,7 b' Test setup'
59 $ mkcommit A1
59 $ mkcommit A1
60 created new head
60 created new head
61 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
61 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
62 obsoleted 1 changesets
62 $ hg log -G --hidden
63 $ hg log -G --hidden
63 @ f6082bc4ffef (draft): A1
64 @ f6082bc4ffef (draft): A1
64 |
65 |
@@ -59,6 +59,7 b' Test setup'
59 $ mkcommit C0
59 $ mkcommit C0
60 created new head
60 created new head
61 $ hg debugobsolete --record-parents `getid "desc(B0)"`
61 $ hg debugobsolete --record-parents `getid "desc(B0)"`
62 obsoleted 1 changesets
62 $ hg log -G --hidden
63 $ hg log -G --hidden
63 @ 0f88766e02d6 (draft): C0
64 @ 0f88766e02d6 (draft): C0
64 |
65 |
@@ -59,6 +59,7 b' Test setup'
59 $ mkcommit C0
59 $ mkcommit C0
60 created new head
60 created new head
61 $ hg debugobsolete --record-parents `getid "desc(A0)"`
61 $ hg debugobsolete --record-parents `getid "desc(A0)"`
62 obsoleted 1 changesets
62 $ hg log -G --hidden
63 $ hg log -G --hidden
63 @ 0f88766e02d6 (draft): C0
64 @ 0f88766e02d6 (draft): C0
64 |
65 |
@@ -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 obsoleted 1 changesets
52 $ hg log -G --hidden
53 $ hg log -G --hidden
53 @ 74ff5441d343 (draft): B0
54 @ 74ff5441d343 (draft): B0
54 |
55 |
@@ -59,7 +59,9 b' Test setup'
59 $ mkcommit A1
59 $ mkcommit A1
60 created new head
60 created new head
61 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
61 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
62 obsoleted 1 changesets
62 $ hg debugobsolete --record-parents `getid "desc(B0)"`
63 $ hg debugobsolete --record-parents `getid "desc(B0)"`
64 obsoleted 1 changesets
63 $ hg log -G --hidden
65 $ hg log -G --hidden
64 @ f6082bc4ffef (draft): A1
66 @ f6082bc4ffef (draft): A1
65 |
67 |
@@ -59,7 +59,9 b' Test setup'
59 $ mkcommit B1
59 $ mkcommit B1
60 created new head
60 created new head
61 $ hg debugobsolete --record-parents `getid "desc(A0)"`
61 $ hg debugobsolete --record-parents `getid "desc(A0)"`
62 obsoleted 1 changesets
62 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
63 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
64 obsoleted 1 changesets
63 $ hg log -G --hidden
65 $ hg log -G --hidden
64 @ 25c56d33e4c4 (draft): B1
66 @ 25c56d33e4c4 (draft): B1
65 |
67 |
@@ -60,7 +60,9 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 obsoleted 1 changesets
63 $ hg debugobsolete --record-parents `getid "desc(B0)"`
64 $ hg debugobsolete --record-parents `getid "desc(B0)"`
65 obsoleted 1 changesets
64 $ hg log -G --hidden
66 $ hg log -G --hidden
65 @ 0f88766e02d6 (draft): C0
67 @ 0f88766e02d6 (draft): C0
66 |
68 |
@@ -63,8 +63,11 b' Test setup'
63 $ mkcommit B1
63 $ mkcommit B1
64 created new head
64 created new head
65 $ hg debugobsolete --record-parents `getid "desc(A0)"`
65 $ hg debugobsolete --record-parents `getid "desc(A0)"`
66 obsoleted 1 changesets
66 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
67 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
68 obsoleted 1 changesets
67 $ hg debugobsolete --record-parents `getid "desc(C0)"`
69 $ hg debugobsolete --record-parents `getid "desc(C0)"`
70 obsoleted 1 changesets
68 $ hg log -G --hidden
71 $ hg log -G --hidden
69 @ 25c56d33e4c4 (draft): B1
72 @ 25c56d33e4c4 (draft): B1
70 |
73 |
@@ -52,7 +52,9 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 obsoleted 1 changesets
55 $ hg debugobsolete --record-parents `getid "desc(A1)"`
56 $ hg debugobsolete --record-parents `getid "desc(A1)"`
57 obsoleted 1 changesets
56 $ hg log -G --hidden
58 $ hg log -G --hidden
57 x ba93660aff8d (draft): A1
59 x ba93660aff8d (draft): A1
58 |
60 |
@@ -51,7 +51,9 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 obsoleted 1 changesets
54 $ hg debugobsolete --record-parents `getid "desc(A1)"`
55 $ hg debugobsolete --record-parents `getid "desc(A1)"`
56 obsoleted 1 changesets
55 $ hg log -G --hidden
57 $ hg log -G --hidden
56 x ba93660aff8d (draft): A1
58 x ba93660aff8d (draft): A1
57 |
59 |
@@ -66,9 +66,13 b' Test setup'
66 $ mkcommit A2
66 $ mkcommit A2
67 created new head
67 created new head
68 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
68 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
69 obsoleted 1 changesets
69 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
70 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
71 obsoleted 1 changesets
70 $ hg debugobsolete --record-parents `getid "desc(B1)"`
72 $ hg debugobsolete --record-parents `getid "desc(B1)"`
73 obsoleted 1 changesets
71 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
74 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
75 obsoleted 1 changesets
72 $ hg log -G --hidden
76 $ hg log -G --hidden
73 @ c1f8d089020f (draft): A2
77 @ c1f8d089020f (draft): A2
74 |
78 |
@@ -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 obsoleted 1 changesets
49 $ hg log -G --hidden
50 $ hg log -G --hidden
50 @ f6082bc4ffef (draft): A1
51 @ f6082bc4ffef (draft): A1
51 |
52 |
@@ -59,7 +59,9 b' Test setup'
59 created new head
59 created new head
60 $ mkcommit B1
60 $ mkcommit B1
61 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
61 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
62 obsoleted 1 changesets
62 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
63 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
64 obsoleted 1 changesets
63 $ hg log -G --hidden
65 $ hg log -G --hidden
64 @ 262c8c798096 (draft): B1
66 @ 262c8c798096 (draft): B1
65 |
67 |
@@ -62,7 +62,9 b' Test setup'
62 created new head
62 created new head
63 $ mkcommit A1
63 $ mkcommit A1
64 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
64 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
65 obsoleted 1 changesets
65 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
66 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
67 obsoleted 1 changesets
66 $ hg log -G --hidden
68 $ hg log -G --hidden
67 @ c1c7524e9488 (draft): A1
69 @ c1c7524e9488 (draft): A1
68 |
70 |
@@ -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 obsoleted 1 changesets
51 $ mkcommit B0
52 $ mkcommit B0
52 $ hg log -G --hidden
53 $ hg log -G --hidden
53 @ f40ded968333 (draft): B0
54 @ f40ded968333 (draft): B0
@@ -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 obsoleted 1 changesets
52 $ hg log -G --hidden
53 $ hg log -G --hidden
53 @ ba93660aff8d (draft): A1
54 @ ba93660aff8d (draft): A1
54 |
55 |
@@ -68,7 +68,9 b' Test setup'
68 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
68 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69 $ mkcommit B1
69 $ mkcommit B1
70 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
70 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
71 obsoleted 1 changesets
71 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
72 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
73 obsoleted 1 changesets
72 $ hg log -G --hidden
74 $ hg log -G --hidden
73 @ d70a1f75a020 (draft): B1
75 @ d70a1f75a020 (draft): B1
74 |
76 |
@@ -68,7 +68,9 b' Test setup'
68 $ mkcommit B1
68 $ mkcommit B1
69 created new head
69 created new head
70 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
70 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
71 obsoleted 1 changesets
71 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
72 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
73 obsoleted 1 changesets
72 $ hg log -G --hidden
74 $ hg log -G --hidden
73 @ 25c56d33e4c4 (draft): B1
75 @ 25c56d33e4c4 (draft): B1
74 |
76 |
@@ -53,7 +53,9 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 obsoleted 1 changesets
56 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
57 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
58 obsoleted 1 changesets
57 $ hg log -G --hidden
59 $ hg log -G --hidden
58 @ c1f8d089020f (draft): A2
60 @ c1f8d089020f (draft): A2
59 |
61 |
@@ -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 obsoleted 1 changesets
52 $ hg up 0
53 $ hg up 0
53 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
54 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
54 $ mkcommit B0
55 $ mkcommit B0
@@ -63,7 +63,9 b' Test setup'
63 $ mkcommit A1
63 $ mkcommit A1
64 created new head
64 created new head
65 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
65 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
66 obsoleted 1 changesets
66 $ hg debugobsolete --record-parents `getid "desc(B0)"`
67 $ hg debugobsolete --record-parents `getid "desc(B0)"`
68 obsoleted 1 changesets
67 $ hg up 0
69 $ hg up 0
68 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
70 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
69 $ mkcommit C0
71 $ mkcommit C0
@@ -66,7 +66,9 b' Test setup'
66 $ mkcommit B1
66 $ mkcommit B1
67 created new head
67 created new head
68 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
68 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
69 obsoleted 1 changesets
69 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
70 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
71 obsoleted 1 changesets
70 $ hg log -G --hidden
72 $ hg log -G --hidden
71 @ 25c56d33e4c4 (draft): B1
73 @ 25c56d33e4c4 (draft): B1
72 |
74 |
@@ -82,7 +82,9 b' Test setup'
82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
83 $ mkcommit B1
83 $ mkcommit B1
84 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
84 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
85 obsoleted 1 changesets
85 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
86 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
87 obsoleted 1 changesets
86 $ hg log -G --hidden
88 $ hg log -G --hidden
87 @ d70a1f75a020 (draft): B1
89 @ d70a1f75a020 (draft): B1
88 |
90 |
@@ -71,7 +71,9 b' Test setup'
71 $ mkcommit B1
71 $ mkcommit B1
72 created new head
72 created new head
73 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
73 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
74 obsoleted 1 changesets
74 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
75 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
76 obsoleted 1 changesets
75 $ hg log -G --hidden
77 $ hg log -G --hidden
76 @ 25c56d33e4c4 (draft): B1
78 @ 25c56d33e4c4 (draft): B1
77 |
79 |
@@ -56,7 +56,9 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 obsoleted 1 changesets
59 $ hg debugobsolete --record-parents `getid "desc(A1)"`
60 $ hg debugobsolete --record-parents `getid "desc(A1)"`
61 obsoleted 1 changesets
60 $ hg log -G --hidden
62 $ hg log -G --hidden
61 @ 0f88766e02d6 (draft): C0
63 @ 0f88766e02d6 (draft): C0
62 |
64 |
@@ -65,8 +65,11 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 obsoleted 1 changesets
68 $ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"`
69 $ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"`
70 obsoleted 1 changesets
69 $ hg debugobsolete --record-parents `getid "desc(A2)"`
71 $ hg debugobsolete --record-parents `getid "desc(A2)"`
72 obsoleted 1 changesets
70 $ hg log -G --hidden
73 $ hg log -G --hidden
71 @ 0f88766e02d6 (draft): C0
74 @ 0f88766e02d6 (draft): C0
72 |
75 |
@@ -1569,6 +1569,7 b' Creating changesets and markers'
1569 $ ID_Q=`hg -R client-racy log -T '{node}\n' -r 'desc("C-Q")'`
1569 $ ID_Q=`hg -R client-racy log -T '{node}\n' -r 'desc("C-Q")'`
1570 $ ID_V=`hg -R client-racy log -T '{node}\n' -r 'desc("C-V")'`
1570 $ ID_V=`hg -R client-racy log -T '{node}\n' -r 'desc("C-V")'`
1571 $ hg -R client-racy debugobsolete $ID_Q $ID_V
1571 $ hg -R client-racy debugobsolete $ID_Q $ID_V
1572 obsoleted 1 changesets
1572
1573
1573 Pushing
1574 Pushing
1574
1575
@@ -1753,6 +1754,7 b' Creating changesets and markers'
1753 $ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'`
1754 $ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'`
1754 $ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'`
1755 $ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'`
1755 $ hg -R client-other debugobsolete $ID_V $ID_W
1756 $ hg -R client-other debugobsolete $ID_V $ID_W
1757 obsoleted 1 changesets
1756
1758
1757 (continue the same head)
1759 (continue the same head)
1758
1760
@@ -555,6 +555,7 b' Test hidden changesets in the rebase set'
555 $ hg add J
555 $ hg add J
556 $ hg commit -m J
556 $ hg commit -m J
557 $ hg debugobsolete `hg log --rev . -T '{node}'`
557 $ hg debugobsolete `hg log --rev . -T '{node}'`
558 obsoleted 1 changesets
558
559
559 $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
560 $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
560 rebasing 9:4bde274eefcf "I"
561 rebasing 9:4bde274eefcf "I"
@@ -710,6 +711,7 b' Even when the chain include missing node'
710 o 0:4a2df7238c3b A
711 o 0:4a2df7238c3b A
711
712
712 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all
713 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all
714 obsoleted 1 changesets
713 $ hg rebase -d 6 -r "4::"
715 $ hg rebase -d 6 -r "4::"
714 rebasing 4:ff2c4d47b71d "C"
716 rebasing 4:ff2c4d47b71d "C"
715 note: not rebasing 7:360bbaa7d3ce "O", it has no successor
717 note: not rebasing 7:360bbaa7d3ce "O", it has no successor
@@ -737,6 +739,7 b' should display a friendly error message'
737 $ hg commit -m nonrelevant
739 $ hg commit -m nonrelevant
738 created new head
740 created new head
739 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=all
741 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=all
742 obsoleted 1 changesets
740 $ hg rebase -r . -d 10
743 $ hg rebase -r . -d 10
741 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
744 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
742
745
@@ -861,6 +864,7 b' Create the changes that we will rebase'
861 $ hg add L
864 $ hg add L
862 $ hg commit -m "dummy change"
865 $ hg commit -m "dummy change"
863 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 19 -T '{node}'` --config experimental.evolution=all
866 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 19 -T '{node}'` --config experimental.evolution=all
867 obsoleted 1 changesets
864
868
865 $ hg log -G -r 17::
869 $ hg log -G -r 17::
866 @ 22:7bdc8a87673d dummy change
870 @ 22:7bdc8a87673d dummy change
@@ -1848,6 +1848,7 b" Test short 'ff...' hash collision"
1848 4:ffff85cff0ff78504fcdc3c0bc10de0c65379249 ffff8
1848 4:ffff85cff0ff78504fcdc3c0bc10de0c65379249 ffff8
1849 2147483647:ffffffffffffffffffffffffffffffffffffffff fffff
1849 2147483647:ffffffffffffffffffffffffffffffffffffffff fffff
1850 $ hg debugobsolete fffbae3886c8fbb2114296380d276fd37715d571
1850 $ hg debugobsolete fffbae3886c8fbb2114296380d276fd37715d571
1851 obsoleted 1 changesets
1851
1852
1852 $ hg debugrevspec '0:wdir() & fff'
1853 $ hg debugrevspec '0:wdir() & fff'
1853 abort: 00changelog.i@fff: ambiguous identifier!
1854 abort: 00changelog.i@fff: ambiguous identifier!
@@ -685,6 +685,7 b' test bug 4073 we need to enable obsolete'
685 shelved as default
685 shelved as default
686 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
686 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
687 $ hg debugobsolete `hg --debug id -i -r 1`
687 $ hg debugobsolete `hg --debug id -i -r 1`
688 obsoleted 1 changesets
688 $ hg unshelve
689 $ hg unshelve
689 unshelving change 'default'
690 unshelving change 'default'
690
691
@@ -502,6 +502,7 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 obsoleted 1 changesets
505 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa d047485b3896813b2a624e86201983520f003206
506 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa d047485b3896813b2a624e86201983520f003206
506
507
507 Test that 5 is detected as a valid destination from 3 and also accepts moving
508 Test that 5 is detected as a valid destination from 3 and also accepts moving
@@ -548,6 +549,7 b' non-obsolete parent but that will be dec'
548 $ hg up --quiet 0
549 $ hg up --quiet 0
549 $ hg up --quiet 2
550 $ hg up --quiet 2
550 $ hg debugobsolete bd10386d478cd5a9faf2e604114c8e6da62d3889
551 $ hg debugobsolete bd10386d478cd5a9faf2e604114c8e6da62d3889
552 obsoleted 1 changesets
551 $ hg up
553 $ hg up
552 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
554 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
553
555
General Comments 0
You need to be logged in to leave comments. Login now