diff -r d1ca81f9e458 -r cb36a4eb0157 tests/test-evolve.t --- a/tests/test-evolve.t Sun Aug 24 01:02:18 2014 +0530 +++ b/tests/test-evolve.t Tue Aug 12 19:09:53 2014 -0400 @@ -251,28 +251,28 @@ | | x 5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc | | - | | o 4:207cbc4ea7fe@default(draft) another feature + | | o 4:6992c59c6b06@default(draft) another feature (child of 568a468b60fc) | |/ - | | x 3:5bb880fc0f12@default(draft) temporary amend commit for 7b36850622b2 + | | x 3:c97947cdc7a2@default(draft) temporary amend commit for 73296a82292a | | | - | | x 2:7b36850622b2@default(draft) another feature + | | x 2:73296a82292a@default(draft) another feature (child of 568a468b60fc) | |/ | x 1:568a468b60fc@default(draft) a nifty feature |/ @ 0:e55e0562ee93@default(public) base $ hg debugobsolete - 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 207cbc4ea7fee30d18b3a25f534fe5db22c6071b 0 (*) {'user': 'test'} (glob) - 5bb880fc0f12dd61eee6de36f62b93fdbc3684b0 0 {7b36850622b2fd159fa30a4fb2a1edd2043b4a14} (*) {'user': 'test'} (glob) + 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'user': 'test'} (glob) + c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'user': 'test'} (glob) 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'user': 'test'} (glob) c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'user': 'test'} (glob) $ hg evolve - move:[4] another feature + move:[4] another feature (child of 568a468b60fc) atop:[6] a nifty feature merging main-file-1 - working directory is now at abe98aeaaa35 + working directory is now at 5b410c3ae5af $ hg log - 7 feature-B: another feature - test + 7 feature-B: another feature (child of 568a468b60fc) - test 6 feature-A: a nifty feature - test 0 : base - test @@ -309,14 +309,14 @@ $ hg evolve --any --traceback recreate:[8] another feature that rox - atop:[7] another feature + atop:[7] another feature (child of 568a468b60fc) computing new diff - committed as ca3b75e3e59b - working directory is now at ca3b75e3e59b + committed as 8234cfce9af9 + working directory is now at 8234cfce9af9 $ hg glog - @ 9 feature-B: bumped update to abe98aeaaa35: - test + @ 9 feature-B: bumped update to 5b410c3ae5af: - test | - o 7 : another feature - test + o 7 : another feature (child of 568a468b60fc) - test | o 6 feature-A: a nifty feature - test | @@ -371,7 +371,7 @@ move:[11] dansk 3! atop:[14] dansk 2! merging main-file-1 - working directory is now at b0e2cfb8dd21 + working directory is now at e65e652e27bf $ hg glog @ 15 : dansk 3! - test |