Rejected patch hunk resolving

Hi!

This is sort of a long shot, but I thought I'd drop a post on the list anyway.

I have been doing some patch applying as of late, and some of them on modified working copies. This invariably leads to that some patches generates rejected patch hunks. This is expected since some of the modifications in the working copy conflicts with the data provided in the patchfile.

The question is: Would it make sense to let TortoiseMerge give a little bit more help when it comes to resolving conflicts in patchfiles? Right now the rejected hunks are shown in a new window. Would it be possible to use the three way "conflict" view instead? That is; showing the rejected hunks inline with the rest of the source as conflicted rows and letting the user select what lines that should end up in the "patched" file.

The three files would then be:
- Original
The file before patching
- Patched
The file after svn patch
- Conflicts
The "Patched" file, but with the rejected hunks forcefully* applied

The lines that differ between "Patched" and "Conflicts" would then be used to denote which lines that are conflicted.

*Forcefully here means doing a best guess of where the hunk should be applied. If no part of the hunk matches, I guess that line numbers would be a best guess of where to put it.

I'm not sure if this would be feasible to do in TortoiseMerge today, but it sure would come in handy when applying large patch files on "dirty" working copies.

Hans-Emil

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2862339

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-24 11:41:18 CEST