equal
deleted
inserted
replaced
236 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
236 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
237 |
237 |
238 Test phase is preserved, no local changes |
238 Test phase is preserved, no local changes |
239 |
239 |
240 $ hg up -C 3 --hidden |
240 $ hg up -C 3 --hidden |
241 updating to a hidden changeset 5eb72dbe0cb4 |
|
242 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 |
243 (leaving bookmark touncommit-bm) |
242 (leaving bookmark touncommit-bm) |
244 working directory parent is obsolete! (5eb72dbe0cb4) |
243 working directory parent is obsolete! (5eb72dbe0cb4) |
245 (use 'hg evolve' to update to its successor: e8db4aa611f6) |
244 (use 'hg evolve' to update to its successor: e8db4aa611f6) |
246 $ hg --config extensions.purge= purge |
245 $ hg --config extensions.purge= purge |
284 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
283 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
285 |
284 |
286 Test --all |
285 Test --all |
287 |
286 |
288 $ hg up -C 3 --hidden |
287 $ hg up -C 3 --hidden |
289 updating to a hidden changeset 5eb72dbe0cb4 |
|
290 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
291 working directory parent is obsolete! (5eb72dbe0cb4) |
289 working directory parent is obsolete! (5eb72dbe0cb4) |
292 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
290 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
293 $ hg --config extensions.purge= purge |
291 $ hg --config extensions.purge= purge |
294 $ hg uncommit --all -X e |
292 $ hg uncommit --all -X e |