[ As an aside: this list prefers bottom-posting (i.e. putting your
reply at the bottom) or inline replying, if possible. Also, plain-text
is preferred, but I'll manage :-). See more below ... ]
On Wed, Apr 1, 2015 at 3:36 AM, Scott Aron Bloom <scott_at_towel42.com> wrote:
> Here is some more info:
>
> First I show the results of the svnversion, showing the mixed revision.
> Then I do a svn merge (with –allow-mixed-revisions) and get the E195020
> error
> Then I do an svn up
> Then another svnversion still showing the mixed revision
> Then finally the merge showing the problem still exists..
>
> Scott
>
>
> $ svnversion
> 28594:29395S
>
> scott_at_Vader ~/sb/bps/9.0.29202
> $ svn merge --allow-mixed-revisions ^/branches/vijay/vhdlBitWidthFix_1 .
> svn: E195020: Cannot merge into mixed-revision working copy [28594:29395];
> try updating first
>
> $ svn up
> Updating '.':
>
> Fetching external item into 'UI\nlview':
> External at revision 26116.
>
> Fetching external item into 'verific':
> External at revision 29173.
>
> Fetching external item into 'tcl':
>
> Fetching external item into 'tcl\Install':
> External at revision 23404.
>
> At revision 28171.
>
> Fetching external item into 'gmock':
> External at revision 11153.
>
> Fetching external item into 'qtiocompressor':
> External at revision 29045.
>
> Fetching external item into 'Licensing':
> External at revision 28829.
>
> Fetching external item into 'tcllib':
> External at revision 23595.
>
> Fetching external item into 'Prerequisites':
> External at revision 28594.
>
> Fetching external item into 'libicu':
> External at revision 28899.
>
> Fetching external item into 'libxcb':
> External at revision 28929.
>
> Fetching external item into 'Installation\FPGALibraries':
> External at revision 29142.
>
> Fetching external item into 'UI\QtGraphVizLib\libcgraphviz':
> External at revision 28492.
>
> At revision 29395.
>
> $ svnversion
> 28594:29395S
>
> $ svn merge --allow-mixed-revisions ^/branches/vijay/vhdlBitWidthFix_1 .
> svn: E195020: Cannot merge into mixed-revision working copy [28594:29395];
> try updating first
Interesting! That definitely points to externals as the likely cause
of the problem. I'll note that 28594 (the first rev reported by
svnversion) is the one of the 'Prerequisites' external item. So I'd
start by analyzing that one a bit more.
Specifically: is that a file external? If so, can you share its
external definition (the value in the svn:externals property that
defines it) -- feel free to strip out confidential information such as
hostname of your server etc. I'm mainly interested to see in what
format it's specified, if it has a peg revision, ...
With that info one might be able to reproduce it on a test repository,
so we can take a closer look.
--
Johan
Received on 2015-04-01 13:03:06 CEST