equal
deleted
inserted
replaced
1057 Test the cases A.0 (f4x) and A.6 (f3x) |
1057 Test the cases A.0 (f4x) and A.6 (f3x) |
1058 |
1058 |
1059 $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit |
1059 $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit |
1060 grafting 3:b69f5839d2d9 "D0" |
1060 grafting 3:b69f5839d2d9 "D0" |
1061 note: possible conflict - f3b was renamed multiple times to: |
1061 note: possible conflict - f3b was renamed multiple times to: |
|
1062 f3a |
1062 f3d |
1063 f3d |
1063 f3a |
|
1064 warning: can't find ancestor for 'f3d' copied from 'f3b'! |
1064 warning: can't find ancestor for 'f3d' copied from 'f3b'! |
1065 |
1065 |
1066 Set up the repository for some further tests |
1066 Set up the repository for some further tests |
1067 |
1067 |
1068 $ hg up -q "min(desc("A0"))" |
1068 $ hg up -q "min(desc("A0"))" |
1124 Test the cases A.1 (f4x) and A.7 (f3x). |
1124 Test the cases A.1 (f4x) and A.7 (f3x). |
1125 |
1125 |
1126 $ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit |
1126 $ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit |
1127 grafting 3:b69f5839d2d9 "D0" |
1127 grafting 3:b69f5839d2d9 "D0" |
1128 note: possible conflict - f3b was renamed multiple times to: |
1128 note: possible conflict - f3b was renamed multiple times to: |
|
1129 f3d |
1129 f3e |
1130 f3e |
1130 f3d |
|
1131 merging f4e and f4a to f4e |
1131 merging f4e and f4a to f4e |
1132 warning: can't find ancestor for 'f3d' copied from 'f3b'! |
1132 warning: can't find ancestor for 'f3d' copied from 'f3b'! |
1133 |
1133 |
1134 Check the results of the grafts tested |
1134 Check the results of the grafts tested |
1135 |
1135 |