230 $ hg bookmarks |
230 $ hg bookmarks |
231 * touncommit-bm 4:e8db4aa611f6 |
231 * touncommit-bm 4:e8db4aa611f6 |
232 touncommit-bm-inactive 4:e8db4aa611f6 |
232 touncommit-bm-inactive 4:e8db4aa611f6 |
233 unrelated 2:f63b90038565 |
233 unrelated 2:f63b90038565 |
234 $ hg debugobsolete |
234 $ hg debugobsolete |
235 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
235 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
236 |
236 |
237 Test phase is preserved, no local changes |
237 Test phase is preserved, no local changes |
238 |
238 |
239 $ hg up -C 3 --hidden |
239 $ hg up -C 3 --hidden |
240 8 files updated, 0 files merged, 1 files removed, 0 files unresolved |
240 8 files updated, 0 files merged, 1 files removed, 0 files unresolved |
276 | o 1:f15c744d48e8@default(/draft) addmore |
276 | o 1:f15c744d48e8@default(/draft) addmore |
277 | |
277 | |
278 o 0:07f494440405@default(/draft) adda |
278 o 0:07f494440405@default(/draft) adda |
279 |
279 |
280 $ hg debugobsolete |
280 $ hg debugobsolete |
281 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
281 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
282 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'user': 'test'} (glob) |
282 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
283 |
283 |
284 Test --all |
284 Test --all |
285 |
285 |
286 $ hg up -C 3 --hidden |
286 $ hg up -C 3 --hidden |
287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
288 working directory parent is obsolete! (5eb72dbe0cb4) |
288 working directory parent is obsolete! (5eb72dbe0cb4) |
289 (5eb72dbe0cb4 has diverged, use 'hg evolve -list --divergent' to resolve the issue) |
289 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --divergent' to resolve the issue) |
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 |
310 R n |
310 R n |
311 $ hg st --copies --change . |
311 $ hg st --copies --change . |
312 A e |
312 A e |
313 |
313 |
314 $ hg debugobsolete |
314 $ hg debugobsolete |
315 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
315 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
316 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'user': 'test'} (glob) |
316 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
317 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'user': 'test'} (glob) |
317 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
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 (*) {'ef1': '*', 'user': 'test'} (glob) |
326 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'user': 'test'} (glob) |
326 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
327 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'user': 'test'} (glob) |
327 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
328 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (*) {'user': 'test'} (glob) |
328 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
329 |
329 |
330 Test instability warning |
330 Test instability warning |
331 |
331 |
332 $ hg ci -m touncommit |
332 $ hg ci -m touncommit |
333 $ echo unrelated > unrelated |
333 $ echo unrelated > unrelated |