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

Fwd: Cannot merge into mixed-revision working copy

From: Mark Phippard <markphip_at_gmail.com>
Date: Sat, 25 Feb 2012 09:53:09 -0500

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).

---------- Forwarded message ----------
From: Daniel Shahaf <danielsh_at_elego.de>
Date: Fri, Feb 24, 2012 at 11:08 PM
Subject: Re: Cannot merge into mixed-revision working copy
To: Joel Low <joel_at_joelsplace.sg>
Cc: "users_at_subversion.apache.org" <users_at_subversion.apache.org>

--allow-mixed-revisions, but the code shouldn't care about the revision
of the external for the purposes of this check.

Can you provide a reproduction recipe, starting from an empty
repository?  In a quick test I couldn't trigger the error you describe.




Joel Low wrote on Sat, Feb 25, 2012 at 11:38:12 +0800:
> Hello,
> I'm trying to do a remote-URL/remote-URL merge (for vendor drops) into my working copy which contains externals (for the binaries). When both are updated to HEAD and I try to do the merge, I get this error message. I've tried using --force, but that seems to work once, but subsequently the merge will still fail with the same error. I've resorted to explicitly updating my external to the same revision as the rest of the WC before merge proceeds.
> Is there a cleaner way around this or am I doing something wrong?
> Regards,
> Joel

Mark Phippard
Received on 2012-02-25 15:53:42 CET

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