Workaround for rebasing commits in moved files

[anka-213]

Copy and rename detection isn't implemented yet for rebases: #47, but I wonder, is there any kind of workaround for when I want to rebase a commit which modifies a renamed file? For example:

o     d   Modify bar
| o   c   Modify foo
| |
o |   b   Rename foo to bar
|/
o     a   Create foo

Is there any way to rebase in either direction, either moving d after c or c after d without just getting a merge conflict that covers the entire file?

[jennings]

You can use git to do the rebase:

• Add a bookmark on the branch tip, if there isn't one already
• git switch foobar
• git rebase main --update-refs
• jj bookmark delete foobar, if you don't want the bookmark anymore.

Git handles rebasing over renames better. Adding a bookmark ensures jj abandons the original commits (you could just abandon them manually, but I think adding a temporary bookmark is easier).