equal
deleted
inserted
replaced
361 | x 1:568a468b60fc@default(draft) a nifty feature |
361 | x 1:568a468b60fc@default(draft) a nifty feature |
362 |/ |
362 |/ |
363 @ 0:e55e0562ee93@default(public) base |
363 @ 0:e55e0562ee93@default(public) base |
364 |
364 |
365 $ hg debugobsolete |
365 $ hg debugobsolete |
366 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
366 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
367 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
367 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
368 $ hg evolve |
368 $ hg evolve |
369 move:[3] another feature (child of 568a468b60fc) |
369 move:[3] another feature (child of 568a468b60fc) |
370 atop:[4] a nifty feature |
370 atop:[4] a nifty feature |
371 merging main-file-1 |
371 merging main-file-1 |
372 working directory is now at 99833d22b0c6 |
372 working directory is now at 99833d22b0c6 |