--- a/tests/test-obsolete.t Wed Sep 13 15:13:51 2017 +0200
+++ b/tests/test-obsolete.t Fri Sep 15 15:48:18 2017 +0200
@@ -520,7 +520,7 @@
#excluded 'whole rebase set is extinct and ignored.' message not in core
$ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0
rebasing 3:0d3f46688ccc "add obsol_c"
- rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip)
+ rebasing 8:159dfc9fa5d3 "add obsol_d''"
2 new content-divergent changesets
$ hg --hidden log -q -r 'successors(3)'
4:725c380fe99b
@@ -611,7 +611,7 @@
$ echo 42 >> f
$ hg commit --amend --traceback --quiet
$ hg log -G
- @ changeset: 15:705ab2a6b72e
+ @ changeset: 14:705ab2a6b72e
| tag: tip
| parent: 10:2033b4e49474
| user: test
@@ -673,7 +673,7 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit "obsolet_conflicting_d"
$ hg summary
- parent: 1[46]:50f11e5e3a63 tip (re)
+ parent: 15:50f11e5e3a63 tip
add obsolet_conflicting_d
branch: default
commit: (clean)
@@ -689,7 +689,7 @@
instability: phase-divergent, content-divergent
summary: add obsol_d'''
- changeset: 16:50f11e5e3a63
+ changeset: 15:50f11e5e3a63
tag: tip
parent: 11:9468a5f5d8b2
user: test
@@ -729,7 +729,7 @@
==============================
$ hg log -G --hidden
- @ changeset: 17:a5f7a21fe7bc
+ @ changeset: 16:a5f7a21fe7bc
| tag: tip
| parent: 2:4538525df7e2
| user: test
@@ -737,25 +737,19 @@
| instability: orphan
| summary: add obsol_d''
|
- | o changeset: 16:50f11e5e3a63
+ | o changeset: 15:50f11e5e3a63
| | parent: 11:9468a5f5d8b2
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: content-divergent
| | summary: add obsolet_conflicting_d
| |
- | | o changeset: 15:705ab2a6b72e
+ | | o changeset: 14:705ab2a6b72e
| | | parent: 10:2033b4e49474
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | summary: add f
| | |
- | | | x changeset: 14:33d458d86621
- | | | | user: test
- | | | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | | obsolete: pruned
- | | | | summary: temporary amend commit for 0b1b6dd009c0
- | | | |
| | | x changeset: 13:0b1b6dd009c0
| | |/ parent: 10:2033b4e49474
| | | user: test
@@ -856,8 +850,7 @@
simple rewrite with a prune attached to it
$ hg debugobsolete --rev 15
- 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
- 33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'ef1': '*', 'user': 'test'} (glob)
+ a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 50f11e5e3a63806e678c734e525502f522d37e38 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
Transitive rewrite