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

Re: svn merge --accept HUH ?

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 17 Sep 2009 20:42:15 +0100

On Thu, Sep 17, 2009 at 02:02:05PM -0500, Paul Hammant wrote:
> Michael,
> What I'm reporting is that use of --diff3-cmd cancels any use of --
> accept.
> In this thread I'm not so much worried about our still breaking merge.
> I would wish that --diff3-cmd is ignored for cases where people use --
> accept, and not silently do something other than what you want. I'm
> going to raise a Svn issue around that specifically :)

Yeah, please file an issue, this sounds like a bug.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-17 21:43:14 CEST

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

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