test: update test output to match b11e8c67fb0f
hg debugobsolete now issues a message about the obsoleted changesets.
--- a/tests/test-exchange-obsmarkers-case-A3.t Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t Fri Jul 21 10:51:37 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
|
@@ -174,7 +176,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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A4.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A5.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A6.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-B5.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-B6.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C2.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C3.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C4.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D1.t Fri Jul 21 10:51:37 2017 +0200
@@ -61,6 +61,7 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg prune -d '0 0' 'desc(B)'
1 changesets pruned
$ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no
--- a/tests/test-exchange-obsmarkers-case-D2.t Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D2.t Fri Jul 21 10:51:37 2017 +0200
@@ -54,6 +54,7 @@
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg prune --date '0 0' .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at a9bdc8b26820
--- a/tests/test-exchange-obsmarkers-case-D3.t Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D3.t Fri Jul 21 10:51:37 2017 +0200
@@ -57,6 +57,7 @@
created new head
$ mkcommit A1
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ obsoleted 1 changesets
$ hg prune -d '0 0' .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 35b183996678
--- a/tests/test-exchange-obsmarkers-case-D4.t Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D4.t Fri Jul 21 10:51:37 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-obsolete.t Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-obsolete.t Fri Jul 21 10:51:37 2017 +0200
@@ -33,6 +33,7 @@
$ getid 3
0d3f46688ccc6e756c7e96cf64c391c411309597
$ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
+ obsoleted 1 changesets
$ hg debugobsolete
4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
@@ -96,6 +97,7 @@
$ mkcommit "obsol_c'" # 4 (on 1)
created new head
$ hg debugobsolete `getid 3` `getid 4`
+ obsoleted 1 changesets
$ qlog
4
- 725c380fe99b
@@ -210,6 +212,7 @@
created new head
1 new unstable changesets
$ hg debugobsolete `getid 5` `getid 6`
+ obsoleted 1 changesets
$ qlog
6
- 95de7fc6918d
@@ -268,6 +271,7 @@
created new head
1 new unstable changesets
$ hg debugobsolete `getid 6` `getid 7`
+ obsoleted 1 changesets
$ hg pull -R ../other-new .
pulling from .
searching for changes
@@ -357,6 +361,7 @@
created new head
1 new unstable changesets
$ hg debugobsolete `getid 7` `getid 8`
+ obsoleted 1 changesets
$ cd ../other-new
$ hg up -q 3
$ hg pull ../local/
@@ -441,6 +446,7 @@
- 1f0dee641bb7
$ hg debugobsolete `getid 9` #kill
+ obsoleted 1 changesets
$ hg up null -q # to be not based on 9 anymore
$ qlog
8
@@ -549,6 +555,7 @@
$ mkcommit "obsol_d'''"
created new head
$ hg debugobsolete `getid 11` `getid 12`
+ obsoleted 1 changesets
$ hg push ../other-new --traceback
pushing to ../other-new
searching for changes
--- a/tests/test-push-checkheads-partial-C1.t Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-partial-C1.t Fri Jul 21 10:51:37 2017 +0200
@@ -57,6 +57,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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-partial-C2.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-partial-C3.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-partial-C4.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B1.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B2.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B3.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B4.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B5.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B6.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B7.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B8.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A1.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A2.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A3.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A4.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A5.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A6.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A7.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A8.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D1.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D2.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D3.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D4.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D5.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D6.t Fri Jul 21 10:51:37 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 Fri Jul 21 10:27:13 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D7.t Fri Jul 21 10:51:37 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
|