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 > repository? In a quick test I couldn't trigger the error you describe. > > http://subversion.apache.org/docs/community-guide/issues#reporting-bugs > > Thanks > > Daniel > > 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 > >
