249 created new head |
249 created new head |
250 |
250 |
251 Lets create divergence |
251 Lets create divergence |
252 $ hg prune 4 -s . --hidden |
252 $ hg prune 4 -s . --hidden |
253 1 changesets pruned |
253 1 changesets pruned |
254 2 new content-divergent changesets |
|
255 |
254 |
256 Making obsolete resolution parent |
255 Making obsolete resolution parent |
257 $ hg prune 3 |
256 $ hg prune 3 |
258 1 changesets pruned |
257 1 changesets pruned |
259 1 new orphan changesets |
|
260 |
258 |
261 $ hg glog |
259 $ hg glog |
262 @ 6:de4ea3103326 updated e |
260 @ 6:de4ea3103326 updated e |
263 | () [default] draft |
261 | () [default] draft |
264 | * 5:ff6f7cd76a7c updated e |
262 | o 5:ff6f7cd76a7c updated e |
265 | | () [default] draft |
263 | | () [default] draft |
266 | x 3:9150fe93bec6 added d |
264 | x 3:9150fe93bec6 added d |
267 | | () [default] draft |
265 | | () [default] draft |
268 | o 2:155349b645be added c |
266 | o 2:155349b645be added c |
269 |/ () [default] draft |
267 |/ () [default] draft |
338 $ hg amend |
336 $ hg amend |
339 |
337 |
340 create some content divergence |
338 create some content divergence |
341 |
339 |
342 $ hg co dff6e52f5e41 --hidden |
340 $ hg co dff6e52f5e41 --hidden |
343 updating to a hidden changeset dff6e52f5e41 |
|
344 (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670) |
|
345 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
341 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
346 working directory parent is obsolete! (dff6e52f5e41) |
342 working directory parent is obsolete! (dff6e52f5e41) |
347 (use 'hg evolve' to update to its successor: 0825dcee2670) |
343 (use 'hg evolve' to update to its successor: 0825dcee2670) |
348 $ hg revert -r .^ c |
344 $ hg revert -r .^ c |
349 $ hg amend |
345 $ hg amend |
350 2 new content-divergent changesets |
|
351 $ hg glog --hidden |
346 $ hg glog --hidden |
352 @ 3:92ecd58f9b05 delete a |
347 @ 3:92ecd58f9b05 delete a |
353 | () [default] draft |
348 | () [default] draft |
354 | * 2:0825dcee2670 delete a |
349 | o 2:0825dcee2670 delete a |
355 |/ () [default] draft |
350 |/ () [default] draft |
356 | x 1:dff6e52f5e41 delete a |
351 | x 1:dff6e52f5e41 delete a |
357 |/ () [default] draft |
352 |/ () [default] draft |
358 o 0:75d2b02c4a5c initial |
353 o 0:75d2b02c4a5c initial |
359 () [default] draft |
354 () [default] draft |