197 $ hg glog |
197 $ hg glog |
198 @ 1:4d1169d82e47 modify a |
198 @ 1:4d1169d82e47 modify a |
199 | () public |
199 | () public |
200 o 0:d3873e73d99e init |
200 o 0:d3873e73d99e init |
201 () public |
201 () public |
202 |
|
203 Bumped Merge changeset: |
|
204 ----------------------- |
|
205 |
|
206 We currently cannot automatically solve bumped changeset that is the |
|
207 product of a merge, we add a test for it. |
|
208 |
|
209 $ mkcommit _a |
|
210 $ hg up .^ |
|
211 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
212 $ mkcommit _b |
|
213 created new head |
|
214 $ mkcommit _c |
|
215 $ hg log -G |
|
216 @ 5:eeaf70969381@default(draft) add _c |
|
217 | |
|
218 o 4:6612fc0ddeb6@default(draft) add _b |
|
219 | |
|
220 | o 3:154ad198ff4a@default(draft) add _a |
|
221 |/ |
|
222 o 1:4d1169d82e47@default(public) modify a |
|
223 | |
|
224 o 0:d3873e73d99e@default(public) init |
|
225 |
|
226 $ hg merge 3 |
|
227 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
228 (branch merge, don't forget to commit) |
|
229 $ hg commit -m "merge" |
|
230 $ hg commit --amend -m "New message" |
|
231 $ hg phase --public 551127da2a8a --hidden |
|
232 1 new phase-divergent changesets |
|
233 $ hg log -G |
|
234 @ 7:b28e84916d8c@default(draft) New message |
|
235 |\ |
|
236 +---o 6:551127da2a8a@default(public) merge |
|
237 | |/ |
|
238 | o 5:eeaf70969381@default(public) add _c |
|
239 | | |
|
240 | o 4:6612fc0ddeb6@default(public) add _b |
|
241 | | |
|
242 o | 3:154ad198ff4a@default(public) add _a |
|
243 |/ |
|
244 o 1:4d1169d82e47@default(public) modify a |
|
245 | |
|
246 o 0:d3873e73d99e@default(public) init |
|
247 |
|
248 $ hg evolve --all --phase-divergent |
|
249 skipping b28e84916d8c : we do not handle merge yet |
|