debugobsolete: also report the number of obsoleted changesets
This seems useful to have the number of obsoleted changesets when calling
debugobsolete.
--- a/mercurial/scmutil.py Sun Jul 16 02:20:06 2017 +0200
+++ b/mercurial/scmutil.py Sun Jul 16 02:33:14 2017 +0200
@@ -1081,6 +1081,7 @@
fp.write(''.join(lines))
_reportobsoletedsource = [
+ 'debugobsolete',
'pull',
'push',
'serve',
--- a/tests/test-bisect.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-bisect.t Sun Jul 16 02:33:14 2017 +0200
@@ -572,6 +572,7 @@
---------------------
$ hg debugobsolete `hg id --debug -i -r tip`
+ obsoleted 1 changesets
$ hg bisect --reset
$ hg bisect --good 15
$ hg bisect --bad 30
--- a/tests/test-bookmarks-pushpull.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-bookmarks-pushpull.t Sun Jul 16 02:33:14 2017 +0200
@@ -475,6 +475,7 @@
$ hg id --debug -r 5
c922c0139ca03858f655e4a2af4dd02796a63969 tip Y
$ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc
+ obsoleted 1 changesets
$ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f
$ hg push http://localhost:$HGPORT2/
pushing to http://localhost:$HGPORT2/
--- a/tests/test-cache-abuse.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-cache-abuse.t Sun Jul 16 02:33:14 2017 +0200
@@ -24,6 +24,7 @@
$ echo dumb > dumb
$ hg ci -qAmdumb
$ hg debugobsolete b1174d11b69e63cb0c5726621a43c859f0858d7f
+ obsoleted 1 changesets
$ hg phase -pr t1
$ hg phase -fsr t2
--- a/tests/test-clone.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-clone.t Sun Jul 16 02:33:14 2017 +0200
@@ -714,6 +714,7 @@
$ echo initial2 > foo
$ hg -q commit -A -m initial1
$ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8
+ obsoleted 1 changesets
$ cd ..
$ hg -q clone --pull source1a source1b
--- a/tests/test-command-template.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-command-template.t Sun Jul 16 02:33:14 2017 +0200
@@ -3590,8 +3590,11 @@
9:c5623987d205cd6d9d8389bfc40fff9dbb670b48
10:c562ddd9c94164376c20b86b0b4991636a3bf84f
$ hg debugobsolete a00be79088084cb3aff086ab799f8790e01a976b
+ obsoleted 1 changesets
$ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48
+ obsoleted 1 changesets
$ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f
+ obsoleted 1 changesets
nodes starting with '11' (we don't have the revision number '11' though)
--- a/tests/test-commandserver.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-commandserver.t Sun Jul 16 02:33:14 2017 +0200
@@ -515,6 +515,7 @@
*** runcommand up null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
*** runcommand phase -df tip
+ obsoleted 1 changesets
*** runcommand log --hidden
changeset: 1:731265503d86
tag: tip
--- a/tests/test-exchange-obsmarkers-case-A3.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t Sun Jul 16 02:33:14 2017 +0200
@@ -73,7 +73,9 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ f6298a8ac3a4 (draft): B1
|
@@ -159,7 +161,9 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ f6298a8ac3a4 (draft): B1
|
--- a/tests/test-exchange-obsmarkers-case-A4.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A4.t Sun Jul 16 02:33:14 2017 +0200
@@ -64,6 +64,7 @@
created new head
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ e5ea8f9c7314 (draft): A1
|
--- a/tests/test-exchange-obsmarkers-case-A5.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A5.t Sun Jul 16 02:33:14 2017 +0200
@@ -66,7 +66,9 @@
$ mkcommit A1
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
+ obsoleted 1 changesets
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 8c0a98c83722 (draft): A1
|
--- a/tests/test-exchange-obsmarkers-case-A6.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A6.t Sun Jul 16 02:33:14 2017 +0200
@@ -64,6 +64,7 @@
create a marker after this
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ e5ea8f9c7314 (draft): A1
|
--- a/tests/test-exchange-obsmarkers-case-B5.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-B5.t Sun Jul 16 02:33:14 2017 +0200
@@ -70,8 +70,10 @@
created new head
$ mkcommit B1
$ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
$ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
+ obsoleted 1 changesets
$ hg prune -qd '0 0' 'desc(B1)'
$ hg log -G --hidden
x 069b05c3876d (draft): B1
--- a/tests/test-exchange-obsmarkers-case-B6.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-B6.t Sun Jul 16 02:33:14 2017 +0200
@@ -57,6 +57,7 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
+ obsoleted 1 changesets
$ hg prune -qd '0 0' .
$ hg log -G --hidden
x f6298a8ac3a4 (draft): B1
--- a/tests/test-exchange-obsmarkers-case-C2.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C2.t Sun Jul 16 02:33:14 2017 +0200
@@ -62,6 +62,7 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ e5ea8f9c7314 (draft): A1
|
--- a/tests/test-exchange-obsmarkers-case-C3.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C3.t Sun Jul 16 02:33:14 2017 +0200
@@ -64,6 +64,7 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg prune -qd '0 0' .
$ hg log -G --hidden
x e5ea8f9c7314 (draft): A1
--- a/tests/test-exchange-obsmarkers-case-C4.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C4.t Sun Jul 16 02:33:14 2017 +0200
@@ -65,6 +65,7 @@
$ mkcommit C
created new head
$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
+ obsoleted 1 changesets
$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
$ hg prune -qd '0 0' .
$ hg log -G --hidden
--- a/tests/test-exchange-obsmarkers-case-D1.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D1.t Sun Jul 16 02:33:14 2017 +0200
@@ -61,7 +61,9 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg prune -d '0 0' 'desc(B)'
+ obsoleted 1 changesets
$ hg strip --hidden -q 'desc(A0)'
$ hg log -G --hidden
@ e5ea8f9c7314 (draft): A1
--- a/tests/test-exchange-obsmarkers-case-D2.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D2.t Sun Jul 16 02:33:14 2017 +0200
@@ -54,7 +54,9 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg prune --date '0 0' .
+ obsoleted 1 changesets
$ hg strip --hidden -q 'desc(A1)'
$ hg log -G --hidden
x 28b51eb45704 (draft): A0
--- a/tests/test-exchange-obsmarkers-case-D3.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D3.t Sun Jul 16 02:33:14 2017 +0200
@@ -57,7 +57,9 @@
created new head
$ mkcommit A1
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg prune -d '0 0' .
+ obsoleted 1 changesets
$ hg strip --hidden -q 'desc(A1)'
$ hg log -G --hidden
@ 35b183996678 (draft): B
--- a/tests/test-exchange-obsmarkers-case-D4.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D4.t Sun Jul 16 02:33:14 2017 +0200
@@ -59,8 +59,10 @@
created new head
$ mkcommit B1
$ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ obsoleted 1 changesets
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
$ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+ obsoleted 1 changesets
$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'`
$ hg log -G --hidden
@ 069b05c3876d (draft): B1
--- a/tests/test-glog.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-glog.t Sun Jul 16 02:33:14 2017 +0200
@@ -2294,6 +2294,7 @@
> EOF
$ hg debugobsolete `hg id --debug -i -r 8`
+ obsoleted 1 changesets
$ testlog
[]
[]
--- a/tests/test-lfconvert.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-lfconvert.t Sun Jul 16 02:33:14 2017 +0200
@@ -329,6 +329,7 @@
> evolution=createmarkers
> EOF
$ hg debugobsolete `hg log -r tip -T "{node}"`
+ obsoleted 1 changesets
$ cd ..
$ hg -R largefiles-repo-hg verify --large --lfa
--- a/tests/test-log.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-log.t Sun Jul 16 02:33:14 2017 +0200
@@ -1707,6 +1707,7 @@
1:a765632148dc55d38c35c4f247c618701886cb2f
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
$ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
+ obsoleted 1 changesets
$ hg up null -q
$ hg log --template='{rev}:{node}\n'
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
@@ -1754,6 +1755,7 @@
$ hg bookmark -d X@foo
$ hg up null -q
$ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05
+ obsoleted 1 changesets
$ echo f > b
$ hg ci -Am'b' -d '2 0'
adding b
@@ -2207,6 +2209,7 @@
$ hg log -T '{node}\n' -r 1
2294ae80ad8447bc78383182eeac50cb049df623
$ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
+ obsoleted 1 changesets
$ hg log -G
o changeset: 4:50b9b36e9c5d
| tag: tip
@@ -2256,6 +2259,7 @@
$ hg log -T '{node}\n' -r 4
50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
$ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
+ obsoleted 1 changesets
$ hg log -G a
@ changeset: 3:15b2327059e5
: tag: tip
--- a/tests/test-obsmarker-template.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-obsmarker-template.t Sun Jul 16 02:33:14 2017 +0200
@@ -190,6 +190,7 @@
$ hg commit -A -m "A0"
adding b
$ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
+ obsoleted 1 changesets
$ hg log --hidden -G
@ changeset: 3:f257fde29c7a
@@ -307,7 +308,9 @@
adding B0
created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
+ obsoleted 1 changesets
$ hg log --hidden -G
@ changeset: 3:eb5a0daa2192
@@ -604,7 +607,9 @@
adding B0
created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
+ obsoleted 1 changesets
$ hg log --hidden -G
@ changeset: 4:eb5a0daa2192
@@ -876,7 +881,9 @@
Create the cycle
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
Check templates
@@ -1033,6 +1040,7 @@
summary: ROOT
$ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
+ obsoleted 1 changesets
$ hg log -G
@ changeset: 7:ba2ed02b0c9a
| tag: tip
@@ -1248,6 +1256,7 @@
$ mkcommit ROOT
$ mkcommit A0
$ hg debugobsolete --record-parent `getid "."`
+ obsoleted 1 changesets
Check output
------------
--- a/tests/test-obsolete-bundle-strip.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-obsolete-bundle-strip.t Sun Jul 16 02:33:14 2017 +0200
@@ -127,6 +127,7 @@
created new head
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
$ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1
+ obsoleted 1 changesets
$ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'`
$ hg up 'desc("ROOT")'
@@ -268,7 +269,9 @@
created new head
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
$ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
+ obsoleted 1 changesets
$ hg up 'desc("ROOT")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log --hidden -G
@@ -450,6 +453,7 @@
created new head
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
$ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
+ obsoleted 1 changesets
$ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
$ hg up 'desc("ROOT")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -590,7 +594,9 @@
created new head
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
$ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
+ obsoleted 1 changesets
(it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
@@ -668,6 +674,7 @@
created new head
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
$ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
+ obsoleted 1 changesets
$ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
(it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
@@ -753,12 +760,16 @@
created new head
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'`
$ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split
+ obsoleted 1 changesets
$ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent
$ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0
$ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'`
$ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'`
+ obsoleted 1 changesets
$ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'`
+ obsoleted 1 changesets
$ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'`
+ obsoleted 1 changesets
$ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'`
$ hg up 'desc("ROOT")'
@@ -1289,6 +1300,7 @@
$ mkcommit 'C-A'
$ mkcommit 'C-B'
$ hg debugobsolete --record-parent `getid 'desc("C-B")'`
+ obsoleted 1 changesets
$ hg up 'desc("ROOT")'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
--- a/tests/test-obsolete-changeset-exchange.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-obsolete-changeset-exchange.t Sun Jul 16 02:33:14 2017 +0200
@@ -34,6 +34,7 @@
o base d20a80d4def38df63a4b330b7fb688f3d4cae1e3
$ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
+ obsoleted 1 changesets
Push it. The bundle should not refer to the extinct changeset.
@@ -132,6 +133,7 @@
$ echo 2b > foo
$ hg -q commit -m 2b
$ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129
+ obsoleted 1 changesets
$ cd ..
client only pulls down 1 changeset
--- a/tests/test-obsolete-checkheads.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-obsolete-checkheads.t Sun Jul 16 02:33:14 2017 +0200
@@ -47,6 +47,7 @@
$ mkcommit new
created new head
$ hg debugobsolete --flags 1 `getid old` `getid new`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 71e3228bffe1 (draft) add new
|
@@ -188,6 +189,7 @@
$ mkcommit desc2
created new head
$ hg debugobsolete `getid old` `getid new`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 5fe37041cc2b (draft) add desc2
|
@@ -296,6 +298,7 @@
$ mkcommit new-unrelated
created new head
$ hg debugobsolete `getid old`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 350a93b716be (draft) add new-unrelated
|
--- a/tests/test-obsolete-divergent.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-obsolete-divergent.t Sun Jul 16 02:33:14 2017 +0200
@@ -59,6 +59,7 @@
$ newcase direct
$ hg debugobsolete `getid A_0` `getid A_1`
+ obsoleted 1 changesets
$ hg debugobsolete `getid A_0` `getid A_2`
$ hg log -G --hidden
o 3:392fd25390da A_2
@@ -117,10 +118,12 @@
$ newcase indirect_known
$ hg debugobsolete `getid A_0` `getid A_1`
+ obsoleted 1 changesets
$ hg debugobsolete `getid A_0` `getid A_2`
$ mkcommit A_3
created new head
$ hg debugobsolete `getid A_2` `getid A_3`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 4:01f36c5a8fda A_3
|
@@ -174,6 +177,7 @@
$ newcase indirect_unknown
$ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ obsoleted 1 changesets
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
$ hg debugobsolete `getid A_0` `getid A_2`
$ hg log -G --hidden
@@ -222,7 +226,9 @@
$ newcase final-unknown
$ hg debugobsolete `getid A_0` `getid A_1`
+ obsoleted 1 changesets
$ hg debugobsolete `getid A_1` `getid A_2`
+ obsoleted 1 changesets
$ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
$ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
@@ -242,11 +248,14 @@
$ newcase converged_divergence
$ hg debugobsolete `getid A_0` `getid A_1`
+ obsoleted 1 changesets
$ hg debugobsolete `getid A_0` `getid A_2`
$ mkcommit A_3
created new head
$ hg debugobsolete `getid A_1` `getid A_3`
+ obsoleted 1 changesets
$ hg debugobsolete `getid A_2` `getid A_3`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 4:01f36c5a8fda A_3
|
@@ -294,6 +303,7 @@
$ newcase split
$ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
+ obsoleted 1 changesets
$ hg log -G --hidden
o 3:392fd25390da A_2
|
@@ -335,16 +345,19 @@
$ mkcommit A_3
created new head
$ hg debugobsolete `getid A_1` `getid A_3`
+ obsoleted 1 changesets
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A_4
created new head
$ hg debugobsolete `getid A_2` `getid A_4`
+ obsoleted 1 changesets
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A_5
created new head
$ hg debugobsolete `getid A_4` `getid A_5`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 6:e442cfc57690 A_5
|
@@ -404,6 +417,7 @@
$ mkcommit B_0; hg up 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg debugobsolete `getid B_0` `getid A_2`
+ obsoleted 1 changesets
$ mkcommit A_7; hg up 0
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -411,6 +425,7 @@
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `getid A_5` `getid A_7` `getid A_8`
+ obsoleted 1 changesets
$ mkcommit A_9; hg up 0
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -512,8 +527,11 @@
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `getid A_9` `getid A_A`
+ obsoleted 1 changesets
$ hg debugobsolete `getid A_7` `getid A_A`
+ obsoleted 1 changesets
$ hg debugobsolete `getid A_8` `getid A_A`
+ obsoleted 1 changesets
$ hg log -G --hidden
o 11:a139f71be9da A_A
|
@@ -609,6 +627,7 @@
$ newcase subset
$ hg debugobsolete `getid A_0` `getid A_2`
+ obsoleted 1 changesets
$ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
$ hg debugsuccessorssets --hidden 'desc('A_0')'
007dc284c1f8
--- a/tests/test-obsolete-tag-cache.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-obsolete-tag-cache.t Sun Jul 16 02:33:14 2017 +0200
@@ -56,6 +56,7 @@
Hiding a non-tip changeset should change filtered hash and cause tags recompute
$ hg debugobsolete -d '0 0' c3cb30f2d2cd0aae008cc91a07876e3c5131fd22 -u dummyuser
+ obsoleted 1 changesets
$ hg tags
tip 5:2942a772f72a
@@ -77,7 +78,9 @@
Hiding another changeset should cause the filtered hash to change
$ hg debugobsolete -d '0 0' d75775ffbc6bca1794d300f5571272879bd280da -u dummyuser
+ obsoleted 1 changesets
$ hg debugobsolete -d '0 0' 5f97d42da03fd56f3b228b03dfe48af5c0adf75b -u dummyuser
+ obsoleted 1 changesets
$ hg tags
tip 5:2942a772f72a
--- a/tests/test-obsolete.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-obsolete.t Sun Jul 16 02:33:14 2017 +0200
@@ -51,6 +51,7 @@
abort: changeset references must be full hexadecimal node identifiers
[255]
$ hg debugobsolete -d '0 0' `getid kill_me` -u babar
+ obsoleted 1 changesets
$ hg debugobsolete
97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}
@@ -84,6 +85,7 @@
created new head
$ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
$ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120'
+ obsoleted 1 changesets
$ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
2:245bde4270cd add original_c
$ hg debugrevlog -cd
@@ -107,6 +109,7 @@
$ mkcommit new_2_c
created new head
$ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
+ obsoleted 1 changesets
$ hg debugobsolete
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
@@ -118,6 +121,7 @@
$ mkcommit new_3_c
created new head
$ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
+ obsoleted 1 changesets
$ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
$ hg debugobsolete
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
@@ -256,6 +260,7 @@
$ hg ci -m 'add n3w_3_c'
created new head
$ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
+ obsoleted 1 changesets
$ hg log -r 'bumped()'
$ hg log -G
@ 6:6f9641995072 (draft) [tip ] add n3w_3_c
@@ -314,6 +319,7 @@
$ mkcommit kill0
$ hg up -q null
$ hg debugobsolete `getid kill0`
+ obsoleted 1 changesets
$ mkcommit a
$ mkcommit b
@@ -508,6 +514,7 @@
$ mkcommit original_d
$ mkcommit original_e
$ hg debugobsolete --record-parents `getid original_d` -d '0 0'
+ obsoleted 1 changesets
$ hg debugobsolete | grep `getid original_d`
94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ hg log -r 'obsolete()'
@@ -601,6 +608,7 @@
created new head
$ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \
> -u 'test <test@example.net>'
+ obsoleted 1 changesets
$ hg outgoing ../tmpf # parasite hg outgoing testin
comparing with ../tmpf
searching for changes
@@ -779,6 +787,66 @@
> do
> hg debugobsolete $node
> done
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
+ obsoleted 1 changesets
$ hg up tip
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -840,6 +908,7 @@
Several troubles on the same changeset (create an unstable and bumped changeset)
$ hg debugobsolete `getid obsolete_e`
+ obsoleted 1 changesets
$ hg debugobsolete `getid original_c` `getid babar`
$ hg log --config ui.logtemplate= -r 'bumped() and unstable()'
changeset: 7:50c51b361e60
@@ -1084,6 +1153,7 @@
grafting 1:1c9eddb02162 "content-1" (tip)
$ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`
+ obsoleted 1 changesets
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
--- a/tests/test-phases.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-phases.t Sun Jul 16 02:33:14 2017 +0200
@@ -593,6 +593,7 @@
(making a changeset hidden; H in that case)
$ hg debugobsolete `hg id --debug -r 5`
+ obsoleted 1 changesets
$ cd ..
$ hg clone initialrepo clonewithobs
--- a/tests/test-push-checkheads-partial-C1.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-partial-C1.t Sun Jul 16 02:33:14 2017 +0200
@@ -59,6 +59,7 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
--- a/tests/test-push-checkheads-partial-C2.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-partial-C2.t Sun Jul 16 02:33:14 2017 +0200
@@ -59,6 +59,7 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ f6082bc4ffef (draft): A1
|
--- a/tests/test-push-checkheads-partial-C3.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-partial-C3.t Sun Jul 16 02:33:14 2017 +0200
@@ -59,6 +59,7 @@
$ mkcommit C0
created new head
$ hg debugobsolete --record-parents `getid "desc(B0)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
--- a/tests/test-push-checkheads-partial-C4.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-partial-C4.t Sun Jul 16 02:33:14 2017 +0200
@@ -59,6 +59,7 @@
$ mkcommit C0
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
--- a/tests/test-push-checkheads-pruned-B1.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B1.t Sun Jul 16 02:33:14 2017 +0200
@@ -49,6 +49,7 @@
$ mkcommit B0
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 74ff5441d343 (draft): B0
|
--- a/tests/test-push-checkheads-pruned-B2.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B2.t Sun Jul 16 02:33:14 2017 +0200
@@ -59,7 +59,9 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(B0)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ f6082bc4ffef (draft): A1
|
--- a/tests/test-push-checkheads-pruned-B3.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B3.t Sun Jul 16 02:33:14 2017 +0200
@@ -59,7 +59,9 @@
$ mkcommit B1
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
--- a/tests/test-push-checkheads-pruned-B4.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B4.t Sun Jul 16 02:33:14 2017 +0200
@@ -60,7 +60,9 @@
$ mkcommit C0
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(B0)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
--- a/tests/test-push-checkheads-pruned-B5.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B5.t Sun Jul 16 02:33:14 2017 +0200
@@ -63,8 +63,11 @@
$ mkcommit B1
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(C0)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
--- a/tests/test-push-checkheads-pruned-B6.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B6.t Sun Jul 16 02:33:14 2017 +0200
@@ -52,7 +52,9 @@
$ hg up 'desc(B0)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
x ba93660aff8d (draft): A1
|
--- a/tests/test-push-checkheads-pruned-B7.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B7.t Sun Jul 16 02:33:14 2017 +0200
@@ -51,7 +51,9 @@
$ hg up 'desc(B0)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
x ba93660aff8d (draft): A1
|
--- a/tests/test-push-checkheads-pruned-B8.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B8.t Sun Jul 16 02:33:14 2017 +0200
@@ -66,9 +66,13 @@
$ mkcommit A2
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ c1f8d089020f (draft): A2
|
--- a/tests/test-push-checkheads-superceed-A1.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A1.t Sun Jul 16 02:33:14 2017 +0200
@@ -46,6 +46,7 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ f6082bc4ffef (draft): A1
|
--- a/tests/test-push-checkheads-superceed-A2.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A2.t Sun Jul 16 02:33:14 2017 +0200
@@ -59,7 +59,9 @@
created new head
$ mkcommit B1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 262c8c798096 (draft): B1
|
--- a/tests/test-push-checkheads-superceed-A3.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A3.t Sun Jul 16 02:33:14 2017 +0200
@@ -62,7 +62,9 @@
created new head
$ mkcommit A1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ c1c7524e9488 (draft): A1
|
--- a/tests/test-push-checkheads-superceed-A4.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A4.t Sun Jul 16 02:33:14 2017 +0200
@@ -48,6 +48,7 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ mkcommit B0
$ hg log -G --hidden
@ f40ded968333 (draft): B0
--- a/tests/test-push-checkheads-superceed-A5.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A5.t Sun Jul 16 02:33:14 2017 +0200
@@ -49,6 +49,7 @@
created new head
$ mkcommit A1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ ba93660aff8d (draft): A1
|
--- a/tests/test-push-checkheads-superceed-A6.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A6.t Sun Jul 16 02:33:14 2017 +0200
@@ -68,7 +68,9 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ d70a1f75a020 (draft): B1
|
--- a/tests/test-push-checkheads-superceed-A7.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A7.t Sun Jul 16 02:33:14 2017 +0200
@@ -68,7 +68,9 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
--- a/tests/test-push-checkheads-superceed-A8.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A8.t Sun Jul 16 02:33:14 2017 +0200
@@ -53,7 +53,9 @@
$ mkcommit A2
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ c1f8d089020f (draft): A2
|
--- a/tests/test-push-checkheads-unpushed-D1.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D1.t Sun Jul 16 02:33:14 2017 +0200
@@ -49,6 +49,7 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B0
--- a/tests/test-push-checkheads-unpushed-D2.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D2.t Sun Jul 16 02:33:14 2017 +0200
@@ -63,7 +63,9 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(B0)"`
+ obsoleted 1 changesets
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit C0
--- a/tests/test-push-checkheads-unpushed-D3.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D3.t Sun Jul 16 02:33:14 2017 +0200
@@ -66,7 +66,9 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
--- a/tests/test-push-checkheads-unpushed-D4.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D4.t Sun Jul 16 02:33:14 2017 +0200
@@ -82,7 +82,9 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ d70a1f75a020 (draft): B1
|
--- a/tests/test-push-checkheads-unpushed-D5.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D5.t Sun Jul 16 02:33:14 2017 +0200
@@ -71,7 +71,9 @@
$ mkcommit B1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
--- a/tests/test-push-checkheads-unpushed-D6.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D6.t Sun Jul 16 02:33:14 2017 +0200
@@ -56,7 +56,9 @@
$ mkcommit C0
created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
--- a/tests/test-push-checkheads-unpushed-D7.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D7.t Sun Jul 16 02:33:14 2017 +0200
@@ -65,8 +65,11 @@
$ mkcommit C0
created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
+ obsoleted 1 changesets
$ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"`
+ obsoleted 1 changesets
$ hg debugobsolete --record-parents `getid "desc(A2)"`
+ obsoleted 1 changesets
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
--- a/tests/test-push-race.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-push-race.t Sun Jul 16 02:33:14 2017 +0200
@@ -1569,6 +1569,7 @@
$ ID_Q=`hg -R client-racy log -T '{node}\n' -r 'desc("C-Q")'`
$ ID_V=`hg -R client-racy log -T '{node}\n' -r 'desc("C-V")'`
$ hg -R client-racy debugobsolete $ID_Q $ID_V
+ obsoleted 1 changesets
Pushing
@@ -1753,6 +1754,7 @@
$ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'`
$ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'`
$ hg -R client-other debugobsolete $ID_V $ID_W
+ obsoleted 1 changesets
(continue the same head)
--- a/tests/test-rebase-obsolete.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-rebase-obsolete.t Sun Jul 16 02:33:14 2017 +0200
@@ -555,6 +555,7 @@
$ hg add J
$ hg commit -m J
$ hg debugobsolete `hg log --rev . -T '{node}'`
+ obsoleted 1 changesets
$ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
rebasing 9:4bde274eefcf "I"
@@ -710,6 +711,7 @@
o 0:4a2df7238c3b A
$ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all
+ obsoleted 1 changesets
$ hg rebase -d 6 -r "4::"
rebasing 4:ff2c4d47b71d "C"
note: not rebasing 7:360bbaa7d3ce "O", it has no successor
@@ -737,6 +739,7 @@
$ hg commit -m nonrelevant
created new head
$ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=all
+ obsoleted 1 changesets
$ hg rebase -r . -d 10
note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
@@ -861,6 +864,7 @@
$ hg add L
$ hg commit -m "dummy change"
$ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 19 -T '{node}'` --config experimental.evolution=all
+ obsoleted 1 changesets
$ hg log -G -r 17::
@ 22:7bdc8a87673d dummy change
--- a/tests/test-revset.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-revset.t Sun Jul 16 02:33:14 2017 +0200
@@ -1848,6 +1848,7 @@
4:ffff85cff0ff78504fcdc3c0bc10de0c65379249 ffff8
2147483647:ffffffffffffffffffffffffffffffffffffffff fffff
$ hg debugobsolete fffbae3886c8fbb2114296380d276fd37715d571
+ obsoleted 1 changesets
$ hg debugrevspec '0:wdir() & fff'
abort: 00changelog.i@fff: ambiguous identifier!
--- a/tests/test-shelve.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-shelve.t Sun Jul 16 02:33:14 2017 +0200
@@ -685,6 +685,7 @@
shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `hg --debug id -i -r 1`
+ obsoleted 1 changesets
$ hg unshelve
unshelving change 'default'
--- a/tests/test-update-branches.t Sun Jul 16 02:20:06 2017 +0200
+++ b/tests/test-update-branches.t Sun Jul 16 02:33:14 2017 +0200
@@ -502,6 +502,7 @@
$ hg id --debug -i -r 4
d047485b3896813b2a624e86201983520f003206
$ hg debugobsolete 6efa171f091b00a3c35edc15d48c52a498929953 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ obsoleted 1 changesets
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa d047485b3896813b2a624e86201983520f003206
Test that 5 is detected as a valid destination from 3 and also accepts moving
@@ -548,6 +549,7 @@
$ hg up --quiet 0
$ hg up --quiet 2
$ hg debugobsolete bd10386d478cd5a9faf2e604114c8e6da62d3889
+ obsoleted 1 changesets
$ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved