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

RE: Fwd: Cannot merge into mixed-revision working copy

From: Bert Huijben <bert_at_qqmail.nl>
Date: Sat, 25 Feb 2012 16:37:51 +0100

> -----Original Message-----
> From: Stefan Sperling [mailto:stsp_at_elego.de]
> Sent: zaterdag 25 februari 2012 16:22
> To: Mark Phippard
> Cc: Subversion Development
> Subject: Re: Fwd: Cannot merge into mixed-revision working copy
> On Sat, Feb 25, 2012 at 09:53:09AM -0500, Mark Phippard wrote:
> > This email on users@ made me realize we have not added this option in
> > Subclipse. Looking at the JavaHL source it looks like it has not been
> > exposed via JavaHL either (so we could not add the option in Subclipse
> > even if we want to).
> I missed exposing this option in the JavaHL bindings when I added it.
> An easy (and recommended) workaround is of course to perform an update
> when a merge fails because of this error. Even if you decide to expose
> this option, it would make sense to encourage users to update the working
> copy instead of using the option.

Is the default to fail?

On the C level the compatibility wrappers don't check for mixed revision by
default to keep the pre 1.7 behavior.

Received on 2012-02-25 16:38:25 CET

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