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.
Received on 2012-02-25 16:22:59 CET