equal
deleted
inserted
replaced
832 $ hg --config extensions.rebase= fix -r . |
832 $ hg --config extensions.rebase= fix -r . |
833 abort: rebase in progress |
833 abort: rebase in progress |
834 (use 'hg rebase --continue' or 'hg rebase --abort') |
834 (use 'hg rebase --continue' or 'hg rebase --abort') |
835 [255] |
835 [255] |
836 |
836 |
|
837 $ cd .. |
|
838 |
837 When fixing a file that was renamed, we should diff against the source of the |
839 When fixing a file that was renamed, we should diff against the source of the |
838 rename for incremental fixing and we should correctly reproduce the rename in |
840 rename for incremental fixing and we should correctly reproduce the rename in |
839 the replacement revision. |
841 the replacement revision. |
840 |
842 |
841 $ hg init fixrenamecommit |
843 $ hg init fixrenamecommit |