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 (use 'hg evolve' to update to its successor) |
245 $ hg --config extensions.purge= purge |
245 $ hg --config extensions.purge= purge |
246 $ hg uncommit -I 'set:added() and e' |
246 $ hg uncommit -I 'set:added() and e' |
247 2 new divergent changesets |
247 2 new divergent changesets |
248 $ hg st --copies |
248 $ hg st --copies |
249 A e |
249 A e |
284 Test --all |
284 Test --all |
285 |
285 |
286 $ hg up -C 3 --hidden |
286 $ hg up -C 3 --hidden |
287 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 |
288 working directory parent is obsolete! |
288 working directory parent is obsolete! |
289 (use "hg evolve" to update to its successor) |
289 (use 'hg evolve' to update to its successor) |
290 $ hg --config extensions.purge= purge |
290 $ hg --config extensions.purge= purge |
291 $ hg uncommit --all -X e |
291 $ hg uncommit --all -X e |
292 1 new divergent changesets |
292 1 new divergent changesets |
293 $ hg st --copies |
293 $ hg st --copies |
294 M b |
294 M b |
318 |
318 |
319 Display a warning if nothing left |
319 Display a warning if nothing left |
320 |
320 |
321 $ hg uncommit e |
321 $ hg uncommit e |
322 new changeset is empty |
322 new changeset is empty |
323 (use "hg prune ." to remove it) |
323 (use 'hg prune .' to remove it) |
324 $ hg debugobsolete |
324 $ hg debugobsolete |
325 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
325 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
326 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob) |
326 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob) |
327 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'user': 'test'} (glob) |
327 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'user': 'test'} (glob) |
328 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (*) {'user': 'test'} (glob) |
328 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (*) {'user': 'test'} (glob) |