[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: problems with merging

From: Stefan Sperling <stsp_at_elego.de>
Date: Sun, 27 Jan 2013 16:32:48 +0100

On Sun, Jan 27, 2013 at 04:06:09PM +0100, Stefan Küng wrote:
> Hi,
> 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:
Received on 2013-01-27 16:33:30 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.