What would be great, is a mode to "graphically" resolve the remaining conflicts (.rej files), after the (gnuwin32/cygwin) "patch" command was issued.
I am missing such a tool, and it could be integrated into WinMerge:
* Left side shows the .orig file (if it exists - or same as right side if not), right side shows the half patched output file, and a third window shows the .rej file.
Then i can copy + paste from the .rej file, and jump to the line numbers in the .rej file also.
* The file list window would show all existing .rej files in the subdir-structure.
Maybe it is an idea for a separate tool - but it would fit well into WinMerge also, what do you think ?
Logged In: YES
user_id=411238
Originator: NO
Isn't that a 3-way merge?
Logged In: YES
user_id=631874
Originator: NO
Nice idea. However it is a lot of work considering it requires reading .rej files, synchronizing them with two given files, 3-panel GUI for all this...
So low priority, lots of things need to happen first. And I consider just applying patch files a lot more useful feature. Once (no plans for it either) we have that, then this would be a lot easier..
Logged In: YES
user_id=923664
Originator: YES
I found out that Emacs actually supports something similar (in diff-mode).
The .rej is loaded for editing and then you have several options:
* convert to unified diff (and back to context diff)
* jump to best matching location for current chunk
* (try to) apply the current chunk with a keypress (or test it only)
* "kill" the current chunk
* while editing the patch, it is autocorrected (line numbers)
It's described here:
http://www.gnuarch.org/gnuarchwiki/Process_\*.rej_files
What I would propose how to implement it is similar:
* normal split diff window: .orig (left) - file to patch (right)
* a simple 3rd window for editing the patch file
* the patch file (current chunk) had to be parsed
each time the user requests an operation ("jump to best location"
for example)
See also:
http://winmerge.org/rfe/990464 Three-way merge