equal
deleted
inserted
replaced
200 6 feature-A: a nifty feature - test |
200 6 feature-A: a nifty feature - test |
201 4 feature-B: another feature - test |
201 4 feature-B: another feature - test |
202 1 : a nifty feature - test |
202 1 : a nifty feature - test |
203 0 : base - test |
203 0 : base - test |
204 $ hg evolve |
204 $ hg evolve |
205 hg relocate --rev 4 6 |
205 hg relocate --rev 8c7704f377af 1075109f9999 |
206 $ hg up feature-B -q #prevent feature-A bookmark to move grml |
206 $ hg up feature-B -q #prevent feature-A bookmark to move grml |
207 $ hg relocate -r 4 6 --traceback |
207 $ hg relocate -r 4 6 --traceback |
208 merging main-file-1 |
208 merging main-file-1 |
209 $ hg log |
209 $ hg log |
210 7 feature-B: another feature - test |
210 7 feature-B: another feature - test |