equal
deleted
inserted
replaced
239 |
239 |
240 $ hg up -C 3 --hidden |
240 $ hg up -C 3 --hidden |
241 8 files updated, 0 files merged, 1 files removed, 0 files unresolved |
241 8 files updated, 0 files merged, 1 files removed, 0 files unresolved |
242 (leaving bookmark touncommit-bm) |
242 (leaving bookmark touncommit-bm) |
243 working directory parent is obsolete! |
243 working directory parent is obsolete! |
|
244 (use "hg evolve" to update to its successor) |
244 $ hg --config extensions.purge= purge |
245 $ hg --config extensions.purge= purge |
245 $ hg uncommit -I 'set:added() and e' |
246 $ hg uncommit -I 'set:added() and e' |
246 2 new divergent changesets |
247 2 new divergent changesets |
247 $ hg st --copies |
248 $ hg st --copies |
248 A e |
249 A e |
283 Test --all |
284 Test --all |
284 |
285 |
285 $ hg up -C 3 --hidden |
286 $ hg up -C 3 --hidden |
286 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
287 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
287 working directory parent is obsolete! |
288 working directory parent is obsolete! |
|
289 (use "hg evolve" to update to its successor) |
288 $ hg --config extensions.purge= purge |
290 $ hg --config extensions.purge= purge |
289 $ hg uncommit --all -X e |
291 $ hg uncommit --all -X e |
290 1 new divergent changesets |
292 1 new divergent changesets |
291 $ hg st --copies |
293 $ hg st --copies |
292 M b |
294 M b |