Fossil SCM

Scenario:

• Do "fossil merge $BRANCH" on the local machine.
• Resolve minor merge conflicts
• "fossil patch push $REMOTE"
• ssh $REMOTE

The local changes that were entered after the merge to resolve the merge conflicts are not copied over to the remote side.

Here is a specific test case associated with the SQLite project:

• "fossil up ba2539f6dee1fff"
• "fossil merge c1c47eff48e0831b"
• Resolve merge conflicts in Makefile.in and src/shell.c.in
• "fossil push $REMOTE"

I have entered this ticket to record the issue. My intent is to fix it after the 2.20 release. It is not a rush.

The problem seems to arise because the merge did file renames, and that confuses the "patch apply" subprocess.

You can see the merge that causes the problem at the top of the change graph in https://sqlite.org/src/vdiff?diff=0&from=ba2539f6dee1fff4&to=c1c47eff48e0831b