--- a/tests/test-evolve.t Fri Oct 20 16:07:40 2017 +0200
+++ b/tests/test-evolve.t Fri Oct 20 19:32:18 2017 +0200
@@ -327,7 +327,7 @@
changeset plus the updating changeset are hidden from view by default::
$ hg log
- 3 feature-B: another feature (child of 568a468b60fc) - test
+ 4 feature-B: another feature (child of 568a468b60fc) - test
1 feature-A: a nifty feature - test
0 : base - test
@@ -346,16 +346,20 @@
$ hg amend
1 new orphan changesets
$ hg log
- 4 feature-A: a nifty feature - test
- 3 feature-B: another feature (child of 568a468b60fc) - test
+ 6 feature-A: a nifty feature - test
+ 4 feature-B: another feature (child of 568a468b60fc) - test
1 : a nifty feature - test
0 : base - test
$ hg up -q 0
$ glog --hidden
- o 4:ba0ec09b1bab@default(draft) a nifty feature
+ o 6:ba0ec09b1bab@default(draft) a nifty feature
|
- | o 3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+ | x 5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc
| |
+ | | o 4:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+ | |/
+ | | x 3:c97947cdc7a2@default(draft) temporary amend commit for 73296a82292a
+ | | |
| | x 2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
| |/
| x 1:568a468b60fc@default(draft) a nifty feature
@@ -364,15 +368,17 @@
$ hg debugobsolete
73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'ef1': '8', 'user': 'test'} (glob)
+ c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'ef1': '0', 'user': 'test'} (glob)
568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'ef1': '8', 'user': 'test'} (glob)
+ c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'ef1': '0', 'user': 'test'} (glob)
$ hg evolve
- move:[3] another feature (child of 568a468b60fc)
- atop:[4] a nifty feature
+ move:[4] another feature (child of 568a468b60fc)
+ atop:[6] 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
+ 7 feature-B: another feature (child of ba0ec09b1bab) - test
+ 6 feature-A: a nifty feature - test
0 : base - test
Test commit -o options
@@ -383,11 +389,11 @@
adding file-from-B
reverting main-file-1
$ sed -i'' -e s/Zwei/deux/ main-file-1
- $ hg commit -m 'another feature that rox' -o 5
+ $ hg commit -m 'another feature that rox' -o 7
created new head
$ hg log
- 6 feature-B: another feature that rox - test
- 4 feature-A: a nifty feature - test
+ 8 feature-B: another feature that rox - test
+ 6 feature-A: a nifty feature - test
0 : base - test
phase change turning obsolete changeset public issue a bumped warning
@@ -397,29 +403,29 @@
all solving bumped troubled
- $ glog
- @ 6:47d52a103155@default(draft) another feature that rox
+ $ hg log -G
+ @ 8 feature-B: another feature that rox - test
|
- | o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+ | o 7 : another feature (child of ba0ec09b1bab) - test
|/
- o 4:ba0ec09b1bab@default(public) a nifty feature
+ o 6 feature-A: a nifty feature - test
|
- o 0:e55e0562ee93@default(public) base
+ o 0 : base - test
$ hg evolve --any --traceback --phasedivergent
- recreate:[6] another feature that rox
- atop:[5] another feature (child of ba0ec09b1bab)
+ recreate:[8] another feature that rox
+ atop:[7] another feature (child of ba0ec09b1bab)
computing new diff
committed as 6707c5e1c49d
working directory is now at 6707c5e1c49d
- $ glog
- @ 7:6707c5e1c49d@default(draft) bumped update to 99833d22b0c6:
+ $ hg log -G
+ @ 9 feature-B: bumped update to 99833d22b0c6: - test
|
- o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+ o 7 : another feature (child of ba0ec09b1bab) - test
|
- o 4:ba0ec09b1bab@default(public) a nifty feature
+ o 6 feature-A: a nifty feature - test
|
- o 0:e55e0562ee93@default(public) base
+ o 0 : base - test
$ hg diff --hidden -r 6707c5e1c49d -r 47d52a103155
$ hg diff -r 6707c5e1c49d^ -r 6707c5e1c49d
@@ -445,17 +451,17 @@
(ninja test for the {trouble} template:
$ hg log -G --template '{rev} {troubles}\n'
- @ 10
+ @ 13
|
- | o 9 orphan
+ | o 11 orphan
| |
- | o 8 orphan
+ | o 10 orphan
| |
- | x 7
+ | x 9
|/
- o 5
+ o 7
|
- o 4
+ o 6
|
o 0
@@ -464,23 +470,23 @@
(/ninja)
$ hg evolve --all --traceback
- move:[8] dansk 2!
- atop:[10] dansk!
+ move:[10] dansk 2!
+ atop:[13] dansk!
merging main-file-1
- move:[9] dansk 3!
- atop:[11] dansk 2!
+ move:[11] dansk 3!
+ atop:[14] dansk 2!
merging main-file-1
working directory is now at 68557e4f0048
$ hg log -G
- @ 12 : dansk 3! - test
+ @ 15 : dansk 3! - test
|
- o 11 : dansk 2! - test
+ o 14 : dansk 2! - test
|
- o 10 feature-B: dansk! - test
+ o 13 feature-B: dansk! - test
|
- o 5 : another feature (child of ba0ec09b1bab) - test
+ o 7 : another feature (child of ba0ec09b1bab) - test
|
- o 4 feature-A: a nifty feature - test
+ o 6 feature-A: a nifty feature - test
|
o 0 : base - test
@@ -540,13 +546,13 @@
checking manifests
crosschecking files in changesets and manifests
checking files
- 3 files, 3 changesets, 3 total revisions
+ 3 files, 4 changesets, 4 total revisions
$ hg --config extensions.hgext.mq= strip 'extinct()'
abort: empty revision set
[255]
(do some garbare collection)
$ hg --config extensions.hgext.mq= strip --hidden 'extinct()' --config devel.strip-obsmarkers=no
- saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-a365b072-backup.hg (glob)
+ saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-d7bd82e9-backup.hg (glob)
$ hg verify
checking changesets
checking manifests
@@ -565,7 +571,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 1 new obsolescence markers
+ 2 new obsolescence markers
(run 'hg update' to get a working copy)
$ hg up
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -842,13 +848,13 @@
2 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ glog
- @ 13:98cb758db56d@default(draft) Folding with custom commit message
+ @ 16:98cb758db56d@default(draft) Folding with custom commit message
|
- o 10:0a2f9b959bb4@default(draft) dansk!
+ o 13:0a2f9b959bb4@default(draft) dansk!
|
- o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+ o 7:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
|
- o 4:ba0ec09b1bab@default(public) a nifty feature
+ o 6:ba0ec09b1bab@default(public) a nifty feature
|
o 0:e55e0562ee93@default(public) base
@@ -861,10 +867,10 @@
2 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg qlog
- 14 - a00182c58888 A longer
+ 17 - a00182c58888 A longer
commit message (draft)
- 5 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
- 4 - ba0ec09b1bab a nifty feature (public)
+ 7 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
+ 6 - ba0ec09b1bab a nifty feature (public)
0 - e55e0562ee93 base (public)
$ cd ..
@@ -906,13 +912,13 @@
$ hg evolve
move:[3] a3
- atop:[4] a2
+ atop:[5] a2
working directory is now at 7c5649f73d11
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
- @ 5 [mybranch] a3
+ @ 6 [mybranch] a3
|
- o 4 [mybranch] a2
+ o 5 [mybranch] a2
|
o 1 [default] a1
|
@@ -926,19 +932,19 @@
$ hg amend -m 'a1_'
2 new orphan changesets
$ hg evolve
- move:[4] a2
- atop:[6] a1_
+ move:[5] a2
+ atop:[7] a1_
working directory is now at eb07e22a0e63
$ hg evolve
- move:[5] a3
- atop:[7] a2
+ move:[6] a3
+ atop:[8] a2
working directory is now at 777c26ca5e78
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
- @ 8 [mybranch] a3
+ @ 9 [mybranch] a3
|
- o 7 [mybranch] a2
+ o 8 [mybranch] a2
|
- o 6 [default] a1_
+ o 7 [default] a1_
|
o 0 [default] a0
@@ -953,13 +959,13 @@
$ hg up -r "desc('a2')"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
- o 9 [default] a1__
+ o 10 [default] a1__
|
- | o 8 [mybranch] a3
+ | o 9 [mybranch] a3
| |
- | @ 7 [mybranch] a2
+ | @ 8 [mybranch] a2
| |
- | x 6 [default] a1_
+ | x 7 [default] a1_
|/
o 0 [default] a0
@@ -978,22 +984,22 @@
.hg/bookmarks
.hg/bookmarks.* (glob)
$ hg evolve
- move:[7] a2
- atop:[9] a1__
+ move:[8] a2
+ atop:[10] a1__
(leaving bookmark testbookmark)
working directory is now at d952e93add6f
$ ls .hg/bookmarks*
.hg/bookmarks
$ glog
- @ 10:d952e93add6f@mybranch(draft) a2
+ @ 11:d952e93add6f@mybranch(draft) a2
|
- o 9:9f8b83c2e7f3@default(draft) a1__
+ o 10:9f8b83c2e7f3@default(draft) a1__
|
- | o 8:777c26ca5e78@mybranch(draft) a3
+ | o 9:777c26ca5e78@mybranch(draft) a3
| |
- | x 7:eb07e22a0e63@mybranch(draft) a2
+ | x 8:eb07e22a0e63@mybranch(draft) a2
| |
- | x 6:faafc6cea0ba@default(draft) a1_
+ | x 7:faafc6cea0ba@default(draft) a1_
|/
o 0:07c1c36d9ef0@default(draft) a0
@@ -1005,35 +1011,35 @@
$ hg revert -r d952e93add6f --all
reverting a
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
- o 10 [mybranch] a2
+ o 11 [mybranch] a2
|
- @ 9 [default] a1__
+ @ 10 [default] a1__
|
- | o 8 [mybranch] a3
+ | o 9 [mybranch] a3
| |
- | x 7 [mybranch] a2
+ | x 8 [mybranch] a2
| |
- | x 6 [default] a1_
+ | x 7 [default] a1_
|/
o 0 [default] a0
$ echo "hello world" > newfile
$ hg add newfile
- $ hg commit -m "add new file bumped" -o 10
+ $ hg commit -m "add new file bumped" -o 11
$ hg phase --public --hidden d952e93add6f
1 new phase-divergent changesets
$ hg log -G
- @ 11 : add new file bumped - test
+ @ 12 : add new file bumped - test
|
- | o 10 : a2 - test
+ | o 11 : a2 - test
|/
- o 9 testbookmark: a1__ - test
+ o 10 testbookmark: a1__ - test
|
- | o 8 : a3 - test
+ | o 9 : a3 - test
| |
- | x 7 : a2 - test
+ | x 8 : a2 - test
| |
- | x 6 : a1_ - test
+ | x 7 : a1_ - test
|/
o 0 : a0 - test
@@ -1042,42 +1048,30 @@
normally the unstable changeset would be solve first
$ hg log -G
- @ 11 : add new file bumped - test
+ @ 12 : add new file bumped - test
|
- | o 10 : a2 - test
+ | o 11 : a2 - test
|/
- o 9 testbookmark: a1__ - test
+ o 10 testbookmark: a1__ - test
|
- | o 8 : a3 - test
+ | o 9 : a3 - test
| |
- | x 7 : a2 - test
+ | x 8 : a2 - test
| |
- | x 6 : a1_ - test
+ | x 7 : a1_ - test
|/
o 0 : a0 - test
$ hg evolve -r "desc('add new file bumped')" --phasedivergent
- recreate:[11] add new file bumped
- atop:[10] a2
+ recreate:[12] add new file bumped
+ atop:[11] a2
computing new diff
committed as f15d32934071
working directory is now at f15d32934071
$ hg evolve --any
- move:[8] a3
- atop:[12] bumped update to d952e93add6f:
+ move:[9] a3
+ atop:[13] bumped update to d952e93add6f:
working directory is now at cce26b684bfe
- $ glog
- @ 13:cce26b684bfe@default(draft) a3
- |
- o 12:f15d32934071@default(draft) bumped 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 troubles in a revset with more than one commit
$ hg up cce26b684bfe -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1090,38 +1084,38 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ printf "newline\nnewline\n" >> a
$ hg log -G
- o 15 : add gh - test
+ o 16 : add gh - test
|
- | o 14 : add gg - test
+ | o 15 : add gg - test
|/
- @ 13 : a3 - test
+ @ 14 : a3 - test
|
- o 12 : bumped update to d952e93add6f: - test
+ o 13 : bumped update to d952e93add6f: - test
|
- o 10 : a2 - test
+ o 11 : a2 - test
|
- o 9 testbookmark: a1__ - test
+ o 10 testbookmark: a1__ - test
|
o 0 : a0 - test
$ hg amend
2 new orphan changesets
- $ glog
- @ 16:edc3c9de504e@default(draft) a3
+ $ hg log -G
+ @ 18 : a3 - test
|
- | o 15:beb41503aa3e@default(draft) add gh
+ | o 16 : add gh - test
| |
- | | o 14:27247fcb2df6@default(draft) add gg
+ | | o 15 : add gg - test
| |/
- | x 13:cce26b684bfe@default(draft) a3
+ | x 14 : a3 - test
|/
- o 12:f15d32934071@default(draft) bumped update to d952e93add6f:
+ o 13 : bumped update to d952e93add6f: - test
|
- o 10:d952e93add6f@mybranch(public) a2
+ o 11 : a2 - test
|
- o 9:9f8b83c2e7f3@default(public) a1__
+ o 10 testbookmark: a1__ - test
|
- o 0:07c1c36d9ef0@default(public) a0
+ o 0 : a0 - test
Evolving an empty revset should do nothing
@@ -1134,25 +1128,25 @@
(do you want to use --orphan)
[2]
$ hg evolve --rev "cce26b684bfe::" --orphan
- move:[14] add gg
- atop:[16] a3
- move:[15] add gh
- atop:[16] a3
+ move:[15] add gg
+ atop:[18] a3
+ move:[16] add gh
+ atop:[18] a3
working directory is now at e02107f98737
- $ glog
- @ 18:e02107f98737@default(draft) add gh
+ $ hg log -G
+ @ 20 : add gh - test
|
- | o 17:24e63b319adf@default(draft) add gg
+ | o 19 : add gg - test
|/
- o 16:edc3c9de504e@default(draft) a3
+ o 18 : a3 - test
|
- o 12:f15d32934071@default(draft) bumped update to d952e93add6f:
+ o 13 : bumped update to d952e93add6f: - test
|
- o 10:d952e93add6f@mybranch(public) a2
+ o 11 : a2 - test
|
- o 9:9f8b83c2e7f3@default(public) a1__
+ o 10 testbookmark: a1__ - test
|
- o 0:07c1c36d9ef0@default(public) a0
+ o 0 : a0 - test
Enabling commands selectively, no command enabled, next and fold and unknown
$ cat >> $HGRCPATH <<EOF
@@ -1268,19 +1262,19 @@
$ hg amend
2 new orphan changesets
$ glog -r "edc3c9de504e::"
- @ 22:8dc373be86d9@default(draft) add j1
+ @ 25:8dc373be86d9@default(draft) add j1
|
- | o 21:d7eadcf6eccd@default(draft) add j3
+ | o 23:d7eadcf6eccd@default(draft) add j3
| |
- | o 20:2223ea564144@default(draft) add j2
+ | o 22:2223ea564144@default(draft) add j2
| |
- | x 19:48490698b269@default(draft) add j1
+ | x 21:48490698b269@default(draft) add j1
|/
- | o 18:e02107f98737@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
| |
- o | 17:24e63b319adf@default(draft) add gg
+ o | 19:24e63b319adf@default(draft) add gg
|/
- o 16:edc3c9de504e@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
@@ -1308,19 +1302,19 @@
new changeset is empty
(use 'hg prune .' to remove it)
$ glog -r "edc3c9de504e::"
- @ 23:044804d0c10d@default(draft) add j1
+ @ 26:044804d0c10d@default(draft) add j1
|
- | o 21:d7eadcf6eccd@default(draft) add j3
+ | o 23:d7eadcf6eccd@default(draft) add j3
| |
- | o 20:2223ea564144@default(draft) add j2
+ | o 22:2223ea564144@default(draft) add j2
| |
- | x 19:48490698b269@default(draft) add j1
+ | x 21:48490698b269@default(draft) add j1
|/
- | o 18:e02107f98737@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
| |
- o | 17:24e63b319adf@default(draft) add gg
+ o | 19:24e63b319adf@default(draft) add gg
|/
- o 16:edc3c9de504e@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
@@ -1334,26 +1328,26 @@
(2 other orphan in the repository, do you want --any or --rev)
[2]
$ hg evolve --all --any
- move:[20] add j2
- atop:[23] add j1
- move:[21] add j3
- atop:[24] add j2
+ move:[22] add j2
+ atop:[26] add j1
+ move:[23] add j3
+ atop:[27] add j2
working directory is now at c9a20e2d74aa
$ glog -r "edc3c9de504e::"
- @ 25:c9a20e2d74aa@default(draft) add j3
+ @ 28:c9a20e2d74aa@default(draft) add j3
|
- o 24:b0e3066231e2@default(draft) add j2
+ o 27:b0e3066231e2@default(draft) add j2
|
- o 23:044804d0c10d@default(draft) add j1
+ o 26:044804d0c10d@default(draft) add j1
|
- | o 18:e02107f98737@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
| |
- o | 17:24e63b319adf@default(draft) add gg
+ o | 19:24e63b319adf@default(draft) add gg
|/
- o 16:edc3c9de504e@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
- $ hg up 24e63b319adf
+ $ hg up 19
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit c5_
created new head
@@ -1368,13 +1362,13 @@
$ hg prune '044804d0c10d::'
3 changesets pruned
$ glog -r "edc3c9de504e::"
- @ 26:2251801b6c91@default(draft) add c5_
+ @ 29:2251801b6c91@default(draft) add c5_
|
- | o 18:e02107f98737@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
| |
- o | 17:24e63b319adf@default(draft) add gg
+ o | 19:24e63b319adf@default(draft) add gg
|/
- o 16:edc3c9de504e@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
@@ -1387,15 +1381,15 @@
$ mkcommit unstableifparentisfolded
created new head
$ glog -r "edc3c9de504e::"
- @ 27:68330ac625b8@default(draft) add unstableifparentisfolded
+ @ 30:68330ac625b8@default(draft) add unstableifparentisfolded
|
- | o 26:2251801b6c91@default(draft) add c5_
+ | o 29:2251801b6c91@default(draft) add c5_
| |
- +---o 18:e02107f98737@default(draft) add gh
+ +---o 20:e02107f98737@default(draft) add gh
| |
- | o 17:24e63b319adf@default(draft) add gg
+ | o 19:24e63b319adf@default(draft) add gg
|/
- o 16:edc3c9de504e@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
@@ -1411,13 +1405,13 @@
> EOF
$ glog -r "edc3c9de504e::"
- o 28:580886d07058@default(draft) add gg
+ o 31:580886d07058@default(draft) add gg
|
- | @ 27:68330ac625b8@default(draft) add unstableifparentisfolded
+ | @ 30:68330ac625b8@default(draft) add unstableifparentisfolded
|/
- | o 18:e02107f98737@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
|/
- o 16:edc3c9de504e@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
@@ -1440,26 +1434,26 @@
1 changesets pruned
1 new orphan changesets
$ glog -r "edc3c9de504e::"
- @ 32:7a555adf2b4a@default(draft) _pp
+ @ 35:7a555adf2b4a@default(draft) _pp
|
- o 31:2be4d2d5bf34@default(draft) _oo
+ o 34:2be4d2d5bf34@default(draft) _oo
|
- | o 30:53f0c003e03e@default(draft) add uu
+ | o 33:53f0c003e03e@default(draft) add uu
| |
- | x 29:1bf2152f4f82@default(draft) oo+pp
+ | x 32:1bf2152f4f82@default(draft) oo+pp
|/
- | o 28:580886d07058@default(draft) add gg
+ | o 31:580886d07058@default(draft) add gg
| |
- o | 27:68330ac625b8@default(draft) add unstableifparentisfolded
+ o | 30:68330ac625b8@default(draft) add unstableifparentisfolded
|/
- | o 18:e02107f98737@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
|/
- o 16:edc3c9de504e@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
$ hg evolve --rev "edc3c9de504e::"
- move:[30] add uu
- atop:[32] _pp
+ move:[33] add uu
+ atop:[35] _pp
working directory is now at 43c3f5ef149f
@@ -1469,7 +1463,7 @@
$ echo "will be amended" > newfile
$ hg commit -m "will be amended"
$ hg parents
- 34 : will be amended - test
+ 37 : will be amended - test
$ echo "will be evolved safely" >> a
$ hg commit -m "will be evolved safely"
@@ -1479,39 +1473,16 @@
$ hg add newlyadded
$ hg commit -m "will cause conflict at evolve"
- $ glog -r "edc3c9de504e::"
- @ 36:02e943732647@default(draft) will cause conflict at evolve
- |
- o 35:f8e30e9317aa@default(draft) will be evolved safely
- |
- o 34:36030b147271@default(draft) will be amended
- |
- o 33:43c3f5ef149f@default(draft) add uu
- |
- o 32:7a555adf2b4a@default(draft) _pp
- |
- o 31:2be4d2d5bf34@default(draft) _oo
- |
- | o 28:580886d07058@default(draft) add gg
- | |
- o | 27:68330ac625b8@default(draft) add unstableifparentisfolded
- |/
- | o 18:e02107f98737@default(draft) add gh
- |/
- o 16:edc3c9de504e@default(draft) a3
- |
- ~
-
$ hg update -q 36030b147271
$ echo "amended" > newfile
$ hg amend -m "amended"
2 new orphan changesets
$ hg evolve --rev "36030b147271::"
- move:[35] will be evolved safely
- atop:[37] amended
- move:[36] will cause conflict at evolve
- atop:[38] will be evolved safely
+ move:[38] will be evolved safely
+ atop:[41] amended
+ move:[39] will cause conflict at evolve
+ atop:[42] will be evolved safely
merging newfile
warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
evolve failed!
@@ -1520,17 +1491,19 @@
[255]
$ glog -r "43c3f5ef149f::" --hidden
- @ 38:c904da5245b0@default(draft) will be evolved safely
+ @ 42:c904da5245b0@default(draft) will be evolved safely
|
- o 37:34ae045ec400@default(draft) amended
+ o 41:34ae045ec400@default(draft) amended
|
- | o 36:02e943732647@default(draft) will cause conflict at evolve
+ | x 40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271
| |
- | x 35:f8e30e9317aa@default(draft) will be evolved safely
- | |
- | x 34:36030b147271@default(draft) will be amended
+ | | o 39:02e943732647@default(draft) will cause conflict at evolve
+ | | |
+ | | x 38:f8e30e9317aa@default(draft) will be evolved safely
+ | |/
+ | x 37:36030b147271@default(draft) will be amended
|/
- o 33:43c3f5ef149f@default(draft) add uu
+ o 36:43c3f5ef149f@default(draft) add uu
|
~