evolve: comparison tests/test-evolve-templates.t

equal deleted inserted replaced

-:4358f29af833
+:19ec729f3ca2
 summary:     ROOT
 Check templates
 ---------------
 $ hg up 'desc(A0)' --hidden
-updating to a hidden changeset 471f378eab4c
-(hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (471f378eab4c)
 (use 'hg evolve' to update to its successor: d004c8f274b9)
 Precursors template should show current revision as it is the working copy
 |/
 o  ""
 $ hg up 'desc(A1)' --hidden
-updating to a hidden changeset a468dc9b3633
-(hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (a468dc9b3633)
 (use 'hg evolve' to update to its successor: d004c8f274b9)
 Precursors template should show current revision as it is the working copy
 Check templates
 ---------------
 $ hg up 'obsolete()' --hidden
-updating to a hidden changeset 471597cad322
-(hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (471597cad322)
 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
 Precursors template should show current revision as it is the working copy
 Check templates
 ---------------
 $ hg up 'desc(A0)' --hidden
-updating to a hidden changeset 471f378eab4c
-(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 working directory parent is obsolete! (471f378eab4c)
 (use 'hg evolve' to update to its successor: eb5a0daa2192)
 Precursors template should show current revision as it is the working copy
 |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
 $ hg up 'desc(B0)' --hidden
-updating to a hidden changeset 0dec01379d3b
-(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (0dec01379d3b)
 (use 'hg evolve' to update to its successor: eb5a0daa2192)
 Precursors template should show both precursors as they should be both
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     ROOT
 $ hg update --hidden 'desc(A0)'
-updating to a hidden changeset 471f378eab4c
-(hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (471f378eab4c)
 (use 'hg evolve' to update to its successor: fdf9bde5129a)
 $ hg amend -m "A2"
 2 new content-divergent changesets
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  instability: content-divergent
 |  summary:     A2
 |
-| *  changeset:   2:fdf9bde5129a
+| o  changeset:   2:fdf9bde5129a
 |/   parent:      0:ea207398892e
 |    user:        test
 |    date:        Thu Jan 01 00:00:00 1970 +0000
 |    instability: content-divergent
 |    summary:     A1
 Check templates
 ---------------
 $ hg up 'desc(A0)' --hidden
-updating to a hidden changeset 471f378eab4c
-(hidden revision '471f378eab4c' has diverged)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (471f378eab4c)
 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
 Precursors template should show current revision as it is the working copy
 $ hg tlog
-*  019fadeab383
+o  019fadeab383
 |    Precursors: 1:471f378eab4c
 |    semi-colon: 1:471f378eab4c
-| *  fdf9bde5129a
+| o  fdf9bde5129a
 |/     Precursors: 1:471f378eab4c
 |      semi-colon: 1:471f378eab4c
 | @  471f378eab4c
 |/     Successors: 2:fdf9bde5129a; 4:019fadeab383
 |      semi-colon: 2:fdf9bde5129a; 4:019fadeab383
 |      Fate: reworded using amend as 4:019fadeab383
 |
 o  ea207398892e
 $ hg fatelog
-*  019fadeab383
+o  019fadeab383
 |
-| *  fdf9bde5129a
+| o  fdf9bde5129a
 |/
 | @  471f378eab4c
 |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
 |
 o  ea207398892e
 $ hg up 'desc(A1)'
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Precursors template should not show precursors as it's not displayed in the
 log
 $ hg tlog
-*  019fadeab383
+o  019fadeab383
 |
 | @  fdf9bde5129a
 |/
 o  ea207398892e
 $ hg fatelog
-*  019fadeab383
+o  019fadeab383
 |
 | @  fdf9bde5129a
 |/
 o  ea207398892e
 Precursors template should a precursor as we force its display with --hidden
 $ hg tlog --hidden
-*  019fadeab383
+o  019fadeab383
 |    Precursors: 3:65b757b745b9
 |    semi-colon: 3:65b757b745b9
 | x  65b757b745b9
 |/     Precursors: 1:471f378eab4c
 |      semi-colon: 1:471f378eab4c
 |      Fate: reworded using amend as 3:65b757b745b9
 |
 o  ea207398892e
 $ hg fatelog --hidden
-*  019fadeab383
+o  019fadeab383
 |
 | x  65b757b745b9
 |/     Obsfate: reworded using amend as 4:019fadeab383
 |
 | @  fdf9bde5129a
 Check templates
 ---------------
 $ hg up 'desc(A0)' --hidden
-updating to a hidden changeset 471f378eab4c
-(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 working directory parent is obsolete! (471f378eab4c)
 (use 'hg evolve' to update to its successor: eb5a0daa2192)
 $ hg tlog
 o  eb5a0daa2192
 |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
 $ hg up 'desc(B0)' --hidden
-updating to a hidden changeset 0dec01379d3b
-(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (0dec01379d3b)
 (use 'hg evolve' to update to its successor: eb5a0daa2192)
 $ hg tlog
 o  eb5a0daa2192
 |
 o  ea207398892e
 $ hg up 'desc(B1)' --hidden
-updating to a hidden changeset b7ea6d14e664
-(hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (b7ea6d14e664)
 (use 'hg evolve' to update to its successor: eb5a0daa2192)
 $ hg tlog
 o  eb5a0daa2192
 Create the cycle
 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
 obsoleted 1 changesets
-1 new orphan changesets
 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
 obsoleted 1 changesets
 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
 Check templates
 @  f897c6137566
 |
 o  ea207398892e
 $ hg up -r "desc(B0)" --hidden
-updating to a hidden changeset 0dec01379d3b
-(hidden revision '0dec01379d3b' is pruned)
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 working directory parent is obsolete! (0dec01379d3b)
 (use 'hg evolve' to update to its parent successor)
 $ hg tlog
 o  f897c6137566
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  instability: content-divergent
 |  summary:     Add B only
 |
-| *  changeset:   8:b18bc8331526
+| o  changeset:   8:b18bc8331526
 |/   parent:      5:dd800401bd8c
 |    user:        test
 |    date:        Thu Jan 01 00:00:00 1970 +0000
 |    instability: content-divergent
 |    summary:     Add only B
 |
-| *  changeset:   7:ba2ed02b0c9a
+| o  changeset:   7:ba2ed02b0c9a
 | |  user:        test
 | |  date:        Thu Jan 01 00:00:00 1970 +0000
 | |  instability: orphan, content-divergent
 | |  summary:     Add A,B,C
 | |
 |    date:        Thu Jan 01 00:00:00 1970 +0000
 |    obsolete:    reworded using amend as 8:b18bc8331526
 |    obsolete:    reworded using amend as 9:0b997eb7ceee
 |    summary:     Add A,B,C
 |
-*  changeset:   5:dd800401bd8c
+o  changeset:   5:dd800401bd8c
 |  parent:      3:f897c6137566
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  instability: content-divergent
 |  summary:     Add A,B,C
 $ hg tlog
 @  0b997eb7ceee
 |    Precursors: 6:4a004186e638
 |    semi-colon: 6:4a004186e638
-| *  b18bc8331526
+| o  b18bc8331526
 |/     Precursors: 6:4a004186e638
 |      semi-colon: 6:4a004186e638
-| *  ba2ed02b0c9a
+| o  ba2ed02b0c9a
 | |
 | x  4a004186e638
 |/     Successors: 8:b18bc8331526; 9:0b997eb7ceee
 |      semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
 |      Fate: reworded using amend as 8:b18bc8331526
 |      Fate: reworded using amend as 9:0b997eb7ceee
 |
-*  dd800401bd8c
+o  dd800401bd8c
 |
 o  f897c6137566
 |
 o  ea207398892e
 $ hg fatelog
 @  0b997eb7ceee
 |
-| *  b18bc8331526
+| o  b18bc8331526
 |/
-| *  ba2ed02b0c9a
+| o  ba2ed02b0c9a
 | |
 | x  4a004186e638
 |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
 |
-*  dd800401bd8c
+o  dd800401bd8c
 |
 o  f897c6137566
 |
 o  ea207398892e
 $ hg tlog --hidden
 @  0b997eb7ceee
 |    Precursors: 6:4a004186e638
 |    semi-colon: 6:4a004186e638
-| *  b18bc8331526
+| o  b18bc8331526
 |/     Precursors: 6:4a004186e638
 |      semi-colon: 6:4a004186e638
-| *  ba2ed02b0c9a
+| o  ba2ed02b0c9a
 | |    Precursors: 4:9bd10a0775e4
 | |    semi-colon: 4:9bd10a0775e4
 | x  4a004186e638
 |/     Precursors: 4:9bd10a0775e4
 |      semi-colon: 4:9bd10a0775e4
 |      Successors: 8:b18bc8331526; 9:0b997eb7ceee
 |      semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
 |      Fate: reworded using amend as 8:b18bc8331526
 |      Fate: reworded using amend as 9:0b997eb7ceee
 |
-*  dd800401bd8c
+o  dd800401bd8c
 |    Precursors: 4:9bd10a0775e4
 |    semi-colon: 4:9bd10a0775e4
 | x  9bd10a0775e4
 |/     Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
 |      semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
 o  ea207398892e
 $ hg fatelog --hidden
 @  0b997eb7ceee
 |
-| *  b18bc8331526
+| o  b18bc8331526
 |/
-| *  ba2ed02b0c9a
+| o  ba2ed02b0c9a
 | |
 | x  4a004186e638
 |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
 |
-*  dd800401bd8c
+o  dd800401bd8c
 |
 | x  9bd10a0775e4
 |/     Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
 |
 o  f897c6137566
 |/     Obsfate: rewritten as 2:0dec01379d3b
 |
 o  ea207398892e
 $ hg up --hidden 4
-updating to a hidden changeset 9bd10a0775e4
-(hidden revision '9bd10a0775e4' has diverged)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (9bd10a0775e4)
 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
 $ hg rebase -r 7 -d 8 --config extensions.rebase=
 rebasing 7:ba2ed02b0c9a "Add A,B,C"
 $ hg tlog
-*  eceed8f98ffc
+o  eceed8f98ffc
 |    Precursors: 4:9bd10a0775e4
 |    semi-colon: 4:9bd10a0775e4
-| *  0b997eb7ceee
+| o  0b997eb7ceee
 | |    Precursors: 4:9bd10a0775e4
 | |    semi-colon: 4:9bd10a0775e4
-* |  b18bc8331526
+o |  b18bc8331526
 |/     Precursors: 4:9bd10a0775e4
 |      semi-colon: 4:9bd10a0775e4
-*  dd800401bd8c
+o  dd800401bd8c
 |    Precursors: 4:9bd10a0775e4
 |    semi-colon: 4:9bd10a0775e4
 | @  9bd10a0775e4
 |/     Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
 |      semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
 o  f897c6137566
 |
 o  ea207398892e
 $ hg fatelog
-*  eceed8f98ffc
+o  eceed8f98ffc
 |
-| *  0b997eb7ceee
+| o  0b997eb7ceee
 | |
-* |  b18bc8331526
+o |  b18bc8331526
 |/
-*  dd800401bd8c
+o  dd800401bd8c
 |
 | @  9bd10a0775e4
 |/     Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
 |
 o  f897c6137566
 Check output
 ------------
 $ hg up "desc(A0)" --hidden
-updating to a hidden changeset 471f378eab4c
-(hidden revision '471f378eab4c' is pruned)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (471f378eab4c)
 (use 'hg evolve' to update to its parent successor)
 $ hg tlog
 @  471f378eab4c

branch	mercurial-4.4
changeset 3714	19ec729f3ca2
parent 3590	d5adce52cef4
parent 3650	35ffd7a4b339
child 3715	a77fb9669e99
child 3930	d00f0c369bc7