Stefan Sperling wrote: > On Sun, Jan 27, 2013 at 04:06:09PM +0100, Stefan Küng wrote: >> using a build from the svn trunk (as of r1439016), I've discovered a >> few problems when merging. >> >> svn co -r23862 >> https://tortoisesvn.googlecode.com/svn/branches/1.7.x/src tsvnsrc >> cd tsvnsrc >> >> Now for the merge: >> svn merge -c23846,23862 https://tortoisesvn.googlecode.com/svn/trunk/src >> >> if you hit 'e' to edit the file, remove the conflict, save it, exit >> the editor, then hit 'r' to mark the conflict as resolved: svn >> reports still a conflict and aborts the merge. Even though I >> explicitly told it that I resolved the conflict! > > Sounds like the issue which was recently discussed here: > http://svn.haxx.se/dev/archive-2013-01/0468.shtml
I'm working on that issue (#4238) and will also look into the rest of what you (Stefan Küng) said. - Julian
