Joel Low wrote on Sat, Feb 25, 2012 at 20:42:08 +0800:
> I've spent quite a bit of time trying to come up with a reproducible
> scenario but I can't come up with anything (similar to what you came
> up with, as close as I could with my set up). I do note that running
> svnversion yields 926:1307MS,
> -Original Message-
> From: Daniel Shahaf [mailto:danie...@elego.de]
> Sent: Saturday, 25 February, 2012 1:40 PM
> To: Joel Low
> Cc: users@subversion.apache.org
> Subject: Re: Cannot merge into mixed-revision working copy
>
> Joel Low wrote on Sat, Feb 25
Joel Low wrote on Sat, Feb 25, 2012 at 13:17:20 +0800:
> Hi Daniel,
>
> > -Original Message-
> > From: Daniel Shahaf [mailto:danie...@elego.de]
> > Sent: Saturday, 25 February, 2012 12:38 PM
> > To: Joel Low
> > Cc: users@subversion.apache.org
>
Hi Daniel,
> -Original Message-
> From: Daniel Shahaf [mailto:danie...@elego.de]
> Sent: Saturday, 25 February, 2012 12:38 PM
> To: Joel Low
> Cc: users@subversion.apache.org
> Subject: Re: Cannot merge into mixed-revision working copy
>
> Daniel Shahaf wrote on
Daniel Shahaf wrote on Sat, Feb 25, 2012 at 06:08:17 +0200:
> --allow-mixed-revisions,
(This is an argument to 'svn merge'.)
> 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
> repo
--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.
http://subversion.apache.org/docs/community
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 t
