evolve: comparison tests/test-evolve-content-divergent-basic.t

equal deleted inserted replaced

-:3810ca63398f
+:79bc0f1a832e
 $ hg prune -s 8374d2ddc3a4 "desc('added b')"
 1 changesets pruned
 $ hg prune -s 593c57f2117e "desc('added b')" --hidden
 1 changesets pruned
-2 new content-divergent changesets
 $ hg log -G --patch
 @  3:8374d2ddc3a4@default(draft) divergent [content-divergent]
 |  diff --git a/bdivergent2 b/bdivergent2
 |  new file mode 100644
 |  --- /dev/null
 |  +++ b/bdivergent2
 |  @@ -0,0 +1,1 @@
 |  +bdivergent
 |
-| *  2:593c57f2117e@default(draft) divergent [content-divergent]
+| o  2:593c57f2117e@default(draft) divergent [content-divergent]
 |/   diff --git a/bdivergent1 b/bdivergent1
 |    new file mode 100644
 |    --- /dev/null
 |    +++ b/bdivergent1
 |    @@ -0,0 +1,1 @@
 -------------------------
 Creating content-divergence with branch change where base, divergent and other
 have different branches
-$ hg branch -r . foobar
+$ hg branch --force foobar
-changed branch on 1 changesets
+marked working directory as branch foobar
+(branches are permanent and global, did you want a bookmark?)
+$ hg amend
 $ hg up c41c793e0ef1 --hidden
-updating to a hidden changeset c41c793e0ef1
-(hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (c41c793e0ef1)
-(use 'hg evolve' to update to its successor: 9e5dffcb3d48)
+(use 'hg evolve' to update to its successor: bdeedce1f621)
 $ echo bar > d
 $ hg branch watwat
 marked working directory as branch watwat
 $ hg amend
-2 new content-divergent changesets
 $ hg glog
 @  6:264b04f771fb added d
 |   () [watwat] draft
-| *  5:9e5dffcb3d48 added d
+| o  5:bdeedce1f621 added d
 |/    () [foobar] draft
 o  3:ca1b80f7960a added c
 |   () [default] draft
 o  2:b1661037fa25 added b
 |   () [default] draft
 > c
 > EOF
 merge:[6] added d
 with: [5] added d
 base: [4] added d
+merging "other" content-divergent changeset 'bdeedce1f621'
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 content divergent changesets on different branches.
 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar?  c
 working directory is now at 0ac42f1bc15c
 $ echo bar > d
 $ hg ci -Aqm "added a d with bar in it, expect some beers"
 $ hg prune -r 0ac42f1bc15c -s . --hidden
 1 changesets pruned
-2 new content-divergent changesets
 $ hg glog
 @  9:59081c9c425a added a d with bar in it, expect some beers
 |   () [default] draft
-| *  8:f621d00f5f0e added d
+| o  8:f621d00f5f0e added d
 |/    () [foobar] draft
 o  3:ca1b80f7960a added c
 |   () [default] draft
 o  2:b1661037fa25 added b
 |   () [default] draft
 $ echo foo > d
 $ hg amend -m "foo to d"
 $ hg up a9d6fd6b5e40 --hidden
-updating to a hidden changeset a9d6fd6b5e40
-(hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (a9d6fd6b5e40)
 (use 'hg evolve' to update to its successor: b10b07a394f1)
 $ echo babar > d
 $ hg amend -m "foo to d"
-2 new content-divergent changesets
 $ hg glog
 @  12:0bb497fed24a foo to d
 |   () [default] draft
-| *  11:b10b07a394f1 foo to d
+| o  11:b10b07a394f1 foo to d
 |/    () [default] draft
 o  3:ca1b80f7960a added c
 |   () [default] draft
 o  2:b1661037fa25 added b
 |   () [default] draft
 $ echo bar > d
 $ hg amend -m "bar to d, expect beers"
 $ hg up 11175423b5dc --hidden
-updating to a hidden changeset 11175423b5dc
-(hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (11175423b5dc)
 (use 'hg evolve' to update to its successor: 27f0463f169a)
 $ echo wat > d
 $ hg amend -m "wat to d, wat?"
-2 new content-divergent changesets
 $ hg glog
 @  15:f542037ddf31 wat to d, wat?
 |   () [default] draft
-| *  14:27f0463f169a bar to d, expect beers
+| o  14:27f0463f169a bar to d, expect beers
 |/    () [default] draft
 o  3:ca1b80f7960a added c
 |   () [default] draft
 o  2:b1661037fa25 added b
 |   () [default] draft
 o  0:6569b5a81c7e@default(public) bk:[] root
 $ echo 'babar' >> a
 $ hg amend
 $ hg up --hidden 'min(desc("More addition"))'
-updating to a hidden changeset 867e43582046
-(hidden revision '867e43582046' was rewritten as: fc6349f931da)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (867e43582046)
 (use 'hg evolve' to update to its successor: fc6349f931da)
 $ mv a a.old
 $ echo 'jungle' > a
 $ cat a.old >> a
 $ rm a.old
 $ hg amend
-2 new content-divergent changesets
 $ glog
 @  3:051337a45e7c@default(draft) bk:[] More addition
 |
-| *  2:fc6349f931da@default(draft) bk:[] More addition
+| o  2:fc6349f931da@default(draft) bk:[] More addition
 |/
 o  0:6569b5a81c7e@default(public) bk:[] root
 Stabilize it
 Check conflict during content-divergence resolution
 ---------------------------------------------------
 $ hg up --hidden 'min(desc("More addition"))'
-updating to a hidden changeset 867e43582046
-(hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (867e43582046)
 (use 'hg evolve' to update to its successor: 5bf84d1d71d1)
 $ echo 'gotta break' >> a
 $ hg amend
-2 new content-divergent changesets
 # reamend so that the case is not the first precursor.
 $ hg amend -m "More addition (2)"
 $ hg phase 'contentdivergent()'
 6: draft
 $ glog
 @  6:13c1b75640a1@default(draft) bk:[] More addition (2)
 |
-| *  4:5bf84d1d71d1@default(draft) bk:[] More addition
+| o  4:5bf84d1d71d1@default(draft) bk:[] More addition
 |/
 o  0:6569b5a81c7e@default(public) bk:[] root
 $ hg evolve -qn --content-divergent --no-all
 > VIII
 > IX
 > EOF
 $ hg commit --amend -m E2
 $ hg --hidden update -r 'desc(E1)'
-updating to a hidden changeset 4a250e5bd992
-(hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51)
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (4a250e5bd992)
 (use 'hg evolve' to update to its successor: 084ae625fa51)
 $ cat << EOF > numbers
 > one
 > VII
 > VIII
 > IX
 > EOF
 $ hg commit --amend -m E3
-2 new content-divergent changesets
 $ hg log -G --patch --hidden
 @  3:19ed1bf64a2c@default(draft) E3 [content-divergent]
 |  diff --git a/numbers b/numbers
 |  --- a/numbers
 |  +++ b/numbers
 |  +++ b/romans
 |  @@ -2,1 +2,1 @@
 |  -II
 |  +ii
 |
-| *  2:084ae625fa51@default(draft) E2 [content-divergent]
+| o  2:084ae625fa51@default(draft) E2 [content-divergent]
 |/   diff --git a/letters b/letters
 |    --- a/letters
 |    +++ b/letters
 |    @@ -4,1 +4,1 @@
 |    -d
 19ed1bf64a2c: E3
 content-divergent: 084ae625fa51 (draft) (precursor 4a250e5bd992)
 $ hg obslog --all --patch
-*  084ae625fa51 (2) E2
+o  084ae625fa51 (2) E2
 |
 | @  19ed1bf64a2c (3) E3
 |/
 x  4a250e5bd992 (1) E1
 rewritten(description, content) as 084ae625fa51 using amend by test (Thu Jan 01 00:00:00 1970 +0000)

branch	mercurial-4.4
changeset 4675	79bc0f1a832e
parent 4553	aafd51f145ea
parent 4673	3ef4980353af