232 $ hg bookmarks |
232 $ hg bookmarks |
233 * touncommit-bm 4:e8db4aa611f6 |
233 * touncommit-bm 4:e8db4aa611f6 |
234 touncommit-bm-inactive 4:e8db4aa611f6 |
234 touncommit-bm-inactive 4:e8db4aa611f6 |
235 unrelated 2:f63b90038565 |
235 unrelated 2:f63b90038565 |
236 $ hg debugobsolete |
236 $ hg debugobsolete |
237 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 {'date': '* *', 'user': 'test'} (glob) |
237 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
238 |
238 |
239 Test phase is preserved, no local changes |
239 Test phase is preserved, no local changes |
240 |
240 |
241 $ hg up -C 3 --hidden |
241 $ hg up -C 3 --hidden |
242 8 files updated, 0 files merged, 1 files removed, 0 files unresolved |
242 8 files updated, 0 files merged, 1 files removed, 0 files unresolved |
276 | o 1:f15c744d48e8@default(stable/draft) addmore |
276 | o 1:f15c744d48e8@default(stable/draft) addmore |
277 | |
277 | |
278 o 0:07f494440405@default(stable/draft) adda |
278 o 0:07f494440405@default(stable/draft) adda |
279 |
279 |
280 $ hg debugobsolete |
280 $ hg debugobsolete |
281 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 {'date': '* *', 'user': 'test'} (glob) |
281 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
282 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 {'date': '* *', 'user': 'test'} (glob) |
282 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'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 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 |
309 R n |
309 R n |
310 $ hg st --copies --change . |
310 $ hg st --copies --change . |
311 A e |
311 A e |
312 |
312 |
313 $ hg debugobsolete |
313 $ hg debugobsolete |
314 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 {'date': '* *', 'user': 'test'} (glob) |
314 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
315 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 {'date': '* *', 'user': 'test'} (glob) |
315 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob) |
316 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 {'date': '* *', 'user': 'test'} (glob) |
316 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'user': 'test'} (glob) |
317 |
317 |
318 Display a warning if nothing left |
318 Display a warning if nothing left |
319 |
319 |
320 $ hg uncommit e |
320 $ hg uncommit e |
321 new changeset is empty |
321 new changeset is empty |
322 (use "hg prune ." to remove it) |
322 (use "hg prune ." to remove it) |
323 $ hg debugobsolete |
323 $ hg debugobsolete |
324 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 {'date': '* *', 'user': 'test'} (glob) |
324 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (*) {'user': 'test'} (glob) |
325 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 {'date': '* *', 'user': 'test'} (glob) |
325 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 (*) {'user': 'test'} (glob) |
326 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 {'date': '* *', 'user': 'test'} (glob) |
326 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (*) {'user': 'test'} (glob) |
327 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 {'date': '* *', 'user': 'test'} (glob) |
327 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (*) {'user': 'test'} (glob) |
328 |
328 |
329 Test instability warning |
329 Test instability warning |
330 |
330 |
331 $ hg ci -m touncommit |
331 $ hg ci -m touncommit |
332 $ echo unrelated > unrelated |
332 $ echo unrelated > unrelated |