equal
deleted
inserted
replaced
236 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'} |
236 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'} |
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 (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) |
|
243 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 |
244 (leaving bookmark touncommit-bm) |
242 (leaving bookmark touncommit-bm) |
245 working directory parent is obsolete! (5eb72dbe0cb4) |
243 working directory parent is obsolete! (5eb72dbe0cb4) |
246 (use 'hg evolve' to update to its successor: e8db4aa611f6) |
244 (use 'hg evolve' to update to its successor: e8db4aa611f6) |
247 $ hg --config extensions.purge= purge |
245 $ hg --config extensions.purge= purge |
268 R m |
266 R m |
269 R n |
267 R n |
270 $ glog --hidden |
268 $ glog --hidden |
271 @ 5:a1d4c1ad76cc@bar(draft) touncommit |
269 @ 5:a1d4c1ad76cc@bar(draft) touncommit |
272 | |
270 | |
273 | * 4:e8db4aa611f6@bar(draft) touncommit |
271 | o 4:e8db4aa611f6@bar(draft) touncommit |
274 |/ |
272 |/ |
275 | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |
273 | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |
276 |/ |
274 |/ |
277 o 2:f63b90038565@default(draft) merge |
275 o 2:f63b90038565@default(draft) merge |
278 |\ |
276 |\ |
285 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'} |
283 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'} |
286 |
284 |
287 Test --all |
285 Test --all |
288 |
286 |
289 $ hg up -C 3 --hidden |
287 $ hg up -C 3 --hidden |
290 updating to a hidden changeset 5eb72dbe0cb4 |
|
291 (hidden revision '5eb72dbe0cb4' has diverged) |
|
292 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 |
293 working directory parent is obsolete! (5eb72dbe0cb4) |
289 working directory parent is obsolete! (5eb72dbe0cb4) |
294 (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) |
295 $ hg --config extensions.purge= purge |
291 $ hg --config extensions.purge= purge |
296 $ hg uncommit --all -X e |
292 $ hg uncommit --all -X e |