Mercurial > evolve

comparison tests/test-unstable.t @ 1604:61dd08f4dc62 mercurial-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable, updating tests output Notable change: - We do not support evolving merge before 3.7 - We don't support inhibit/direct-access
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 10 Feb 2016 23:44:00 +0000
parents 526253198860
children 093c445fd86a
comparison
equal deleted inserted replaced
1601:15318c3460bf 1604:61dd08f4dc62
98 | x 1:b3264cec9506@default(draft) add _a 98 | x 1:b3264cec9506@default(draft) add _a
99 |/ 99 |/
100 o 0:b4952fcf48cf@default(draft) add base 100 o 0:b4952fcf48cf@default(draft) add base
101 101
102 102
103 $ hg evo --all --any --unstable 103 # Unsupported before 3.7
104 move:[3] merge 104 #
105 atop:[4] aprime 105 # $ hg evo --all --any --unstable
106 abort: no support for evolving merge changesets yet 106 # move:[3] merge
107 (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one) 107 # atop:[4] aprime
108 [255] 108 # working directory is now at 0bf3f3a59c8c
109 $ hg log -G 109 # $ hg log -G
110 @ 4:47127ea62e5f@default(draft) aprime 110 # @ 5:0bf3f3a59c8c@default(draft) merge
111 | 111 # |\
112 | o 3:6b4280e33286@default(draft) merge 112 # | o 4:47127ea62e5f@default(draft) aprime
113 | |\ 113 # | |
114 +---o 2:474da87dd33b@default(draft) add _c 114 # o | 2:474da87dd33b@default(draft) add _c
115 | | 115 # |/
116 | x 1:b3264cec9506@default(draft) add _a 116 # o 0:b4952fcf48cf@default(draft) add base
117 |/ 117 #
118 o 0:b4952fcf48cf@default(draft) add base
119
120 118
121 $ cd .. 119 $ cd ..
122 120
123 =============================================================================== 121 ===============================================================================
124 Test instability resolution for a merge changeset unstable because both 122 Test instability resolution for a merge changeset unstable because both
156 |/ 154 |/
157 o 0:b4952fcf48cf@default(draft) add base 155 o 0:b4952fcf48cf@default(draft) add base
158 156
159 157
160 $ hg evo --all --any --unstable 158 $ hg evo --all --any --unstable
161 move:[3] merge 159 abort: no support for evolving merge changesets with two obsolete parents yet
162 atop:[5] cprime
163 abort: no support for evolving merge changesets yet
164 (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one) 160 (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one)
165 [255] 161 [255]
166 $ hg log -G 162 $ hg log -G
167 @ 5:2db39fda7e2f@default(draft) cprime 163 @ 5:2db39fda7e2f@default(draft) cprime
168 | 164 |