The attached 'merge-again-after-conflicts-1.patch' partially addresses the problem whereby merge currently doesn't continue to the next revision range after interactive conflict resolution, even if you resolve all the conflicts.
I'm not sure whether to commit this yet, as it's broken for non-merge-tracking merges, as mentioned in the log message in the patch file. I could commit it and then continue working on it. We don't have automated tests for this. The tests will need to provide interactive input and I'm not sure how to do that. If anyone is willing to try it (on merge-tracking merges), and/or review the code, I'd be grateful. - Julian -- Certified & Supported Apache Subversion Downloads: http://www.wandisco.com/subversion/download
merge-again-after-conflicts-1.patch
Description: Binary data
