evolve: comparison tests/test-evolve.t

equal deleted inserted replaced

-:96ce1030d2fb
+:bcd52ce0916d
 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
 $ hg evolve
 move:[3] another feature (child of 568a468b60fc)
 atop:[4] a nifty feature
 merging main-file-1
-working directory is now at 99833d22b0c6
 $ hg log
 5	feature-B: another feature (child of ba0ec09b1bab) - test
 4	feature-A: a nifty feature - test
 0	: base - test
 Test commit -o options
 $ hg up -r "desc('a nifty feature')"
-1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg revert -r "desc('another feature')" --all
 reverting main-file-1
 adding file-from-B
 $ sed -i'' -e s/Zwei/deux/ main-file-1
 $ hg commit -m 'another feature that rox' -o 5
 move:[8] dansk 2!
 atop:[10] dansk!
 merging main-file-1
 move:[9] dansk 3!
 merging main-file-1
-working directory is now at 96abb1319a47
 $ hg log -G
-@  12	: dansk 3! - test
+o  12	: dansk 3! - test
 |
 o  11	: dansk 2! - test
 |
-o  10	feature-B: dansk! - test
+@  10	feature-B: dansk! - test
 |
 o  5	: another feature (child of ba0ec09b1bab) - test
 |
 o  4	feature-A: a nifty feature - test
 |
 R a
 Test fold with commit messages
 $ cd ../work
+$ hg up
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg fold --from .^ --message "Folding with custom commit message"
 2 changesets folded
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ glog
 @  13:284c0d45770d@default(draft) Folding with custom commit message
 1 new orphan changesets
 $ hg evolve
 move:[3] a3
 atop:[4] a2
-working directory is now at 7c5649f73d11
 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-@  5 [mybranch] a3
+o  5 [mybranch] a3
 |
-o  4 [mybranch] a2
+@  4 [mybranch] a2
 |
 o  1 [default] a1
 |
 o  0 [default] a0
 $ hg amend -m 'a1_'
 2 new orphan changesets
 $ hg evolve
 move:[4] a2
 atop:[6] a1_
-working directory is now at eb07e22a0e63
 $ hg evolve
 move:[5] a3
 atop:[7] a2
-working directory is now at 777c26ca5e78
 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-@  8 [mybranch] a3
+o  8 [mybranch] a3
 |
 o  7 [mybranch] a2
 |
-o  6 [default] a1_
+@  6 [default] a1_
 |
 o  0 [default] a0
 Evolve from the middle of a stack pick the right changesets.
-$ hg up -r "desc('a1_')"
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg ci --amend -m 'a1__'
 2 new orphan changesets
 $ hg up -r "desc('a2')"
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 .hg/bookmarks.* (glob)
 $ hg evolve
 move:[7] a2
 atop:[9] a1__
 (leaving bookmark testbookmark)
-working directory is now at d952e93add6f
 $ ls .hg/bookmarks*
 .hg/bookmarks
 $ glog
-@  10:d952e93add6f@mybranch(draft) a2
+o  10:d952e93add6f@mybranch(draft) a2
 |
-o  9:9f8b83c2e7f3@default(draft) a1__
+@  9:9f8b83c2e7f3@default(draft) a1__
 |
 | *  8:777c26ca5e78@mybranch(draft) a3
 | |
 | x  7:eb07e22a0e63@mybranch(draft) a2
 | |
 o  0:07c1c36d9ef0@default(draft) a0
 Possibility to select what instability to solve first, asking for
 phase-divergent before content-divergent
-$ hg up -r "desc('a1__')"
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg revert -r d952e93add6f --all
 reverting a
 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
 o  10 [mybranch] a2
 |
 committed as a8bb31d4b7f2
 working directory is now at a8bb31d4b7f2
 $ hg evolve --any
 move:[8] a3
 atop:[12] phase-divergent update to d952e93add6f:
-working directory is now at b88539ad24d7
 $ glog
-@  13:b88539ad24d7@default(draft) a3
+o  13:b88539ad24d7@default(draft) a3
 |
-o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
+@  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
 |
 o  10:d952e93add6f@mybranch(public) a2
 |
 o  9:9f8b83c2e7f3@default(public) a1__
 |
 o  0:07c1c36d9ef0@default(public) a0
 Check that we can resolve instabilities in a revset with more than one commit
 $ hg up b88539ad24d7 -C
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ mkcommit gg
 $ hg up b88539ad24d7
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ mkcommit gh
 created new head
 $ hg evolve --rev "b88539ad24d7::" --orphan
 move:[14] add gg
 atop:[16] a3
 move:[15] add gh
 atop:[16] a3
-working directory is now at 0c049e4e5422
 $ glog
-@  18:0c049e4e5422@default(draft) add gh
+o  18:0c049e4e5422@default(draft) add gh
 |
 | o  17:98e171e2f272@default(draft) add gg
 |/
-o  16:0cf3707e8971@default(draft) a3
+@  16:0cf3707e8971@default(draft) a3
 |
 o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
 |
 o  10:d952e93add6f@mybranch(public) a2
 |
 [255]
 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
 $ hg --hidden up 14
-2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updated to hidden changeset 484fb3cfa7f2
 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
 working directory parent is obsolete! (484fb3cfa7f2)
 $ cat >> $HGRCPATH <<EOF
 > [experimental]
 [2]
 $ hg evolve --all --any
 move:[20] add j2
 atop:[23] add j1
 move:[21] add j3
-working directory is now at 0d9203b74542
 $ glog -r "0cf3707e8971::"
-@  25:0d9203b74542@default(draft) add j3
+o  25:0d9203b74542@default(draft) add j3
 |
 o  24:f1b85956c48c@default(draft) add j2
 |
 o  23:0ef9ff75f8e2@default(draft) add j1
 |
-| o  18:0c049e4e5422@default(draft) add gh
+| @  18:0c049e4e5422@default(draft) add gh
 | |
 o |  17:98e171e2f272@default(draft) add gg
 |/
 o  16:0cf3707e8971@default(draft) a3
 |
 ~
 $ hg up 98e171e2f272
-0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ mkcommit c5_
 created new head
 $ hg prune '0ef9ff75f8e2 + f1b85956c48c'
 abort: prune will orphan 1 descendants
 (see 'hg help evolution.instability')
 atop:[5] updated c
 move:[10] merge feature branch
 atop:[6] updated f
 move:[8] added e
 atop:[9] updated d
-working directory is now at 7c67cee06242

changeset 4577	bcd52ce0916d
parent 4576	96ce1030d2fb
child 4579	e6d7d261ca4a