equal
deleted
inserted
replaced
267 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
267 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
268 |
268 |
269 $ echo bar > d |
269 $ echo bar > d |
270 $ hg ci -Aqm "added a d with bar in it, expect some beers" |
270 $ hg ci -Aqm "added a d with bar in it, expect some beers" |
271 |
271 |
272 $ hg prune -r 0ac42f1bc15c -s . --hidden |
272 $ hg prune -r 'predecessors(desc("added d") - obsolete())' -s . --hidden |
273 1 changesets pruned |
273 1 changesets pruned |
274 2 new content-divergent changesets |
274 2 new content-divergent changesets |
275 |
275 |
276 $ hg glog |
276 $ hg glog |
277 @ 9:59081c9c425a added a d with bar in it, expect some beers |
277 @ 9:59081c9c425a added a d with bar in it, expect some beers |
309 When base has different message and both divergents has same one |
309 When base has different message and both divergents has same one |
310 |
310 |
311 $ echo foo > d |
311 $ echo foo > d |
312 $ hg amend -m "foo to d" |
312 $ hg amend -m "foo to d" |
313 |
313 |
314 $ hg up a9d6fd6b5e40 --hidden |
314 $ hg up 'predecessors(.)' --hidden |
315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
316 updated to hidden changeset a9d6fd6b5e40 |
316 updated to hidden changeset a9d6fd6b5e40 |
317 (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) |
317 (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) |
318 working directory parent is obsolete! (a9d6fd6b5e40) |
318 working directory parent is obsolete! (a9d6fd6b5e40) |
319 (use 'hg evolve' to update to its successor: b10b07a394f1) |
319 (use 'hg evolve' to update to its successor: b10b07a394f1) |
369 conflicts |
369 conflicts |
370 |
370 |
371 $ echo bar > d |
371 $ echo bar > d |
372 $ hg amend -m "bar to d, expect beers" |
372 $ hg amend -m "bar to d, expect beers" |
373 |
373 |
374 $ hg up 11175423b5dc --hidden |
374 $ hg up 'predecessors(.)' --hidden |
375 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
375 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
376 updated to hidden changeset 11175423b5dc |
376 updated to hidden changeset 11175423b5dc |
377 (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) |
377 (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) |
378 working directory parent is obsolete! (11175423b5dc) |
378 working directory parent is obsolete! (11175423b5dc) |
379 (use 'hg evolve' to update to its successor: 27f0463f169a) |
379 (use 'hg evolve' to update to its successor: 27f0463f169a) |