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@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 From: Scott Aron Bloom [mailto:sc...@towel42.com] Sent: Tuesday, March 31, 2015 6:46 AM To: Johan Corveleyn Cc: users@subversion.apache.org Subject: RE: Issue in svn E195020 Sorry, I misunderstood your question. Svn up succeeds but does not fix th3 svn merge issue. I'll look at the stack overflow issue since we do have a bunch of externals. ~~Scott -------- Original message -------- From: Johan Corveleyn <jcor...@gmail.com<mailto:jcor...@gmail.com>> Date:03/31/2015 02:29 (GMT-08:00) To: Scott Aron Bloom <sc...@towel42.com<mailto:sc...@towel42.com>> Cc: users@subversion.apache.org<mailto:users@subversion.apache.org> Subject: Re: Issue in svn E195020 On Tue, Mar 31, 2015 at 2:56 AM, Scott Aron Bloom <sc...@towel42.com<mailto:sc...@towel42.com>> wrote: > > > > ~~Scott > > -------- Original message -------- > From: Johan Corveleyn <jcor...@gmail.com<mailto:jcor...@gmail.com>> > Date:03/30/2015 12:48 (GMT-08:00) > To: Scott Aron Bloom <sc...@towel42.com<mailto:sc...@towel42.com>> > Cc: users@subversion.apache.org<mailto:users@subversion.apache.org> > Subject: Re: Issue in svn E195020 > > >> Its has been common, that after the merge, if another merge is attempted >> we >> get the E195020 error, (cannot merge into mixed-revision), a simple >> >> svn up >> >> Fixes the issue, however lately, the svn up fails, and the E195020 >> continues. >> > > Why does svn up fail? Error message? It would be interesting to > address this first, because merging into a uniform revision working > copy is still the recommended workflow. > = > I get error E195020 every time. You said "svn up fails". Does 'svn up' give an error message then? I find it hard to believe that 'svn up' would say: svn: E195020: Cannot merge into mixed-revision working copy [X:Y]; try updating first" So does 'svn up' really fail (i.e. gives an error)? If so, can you please copy-paste its error message? Or do you mean that 'svn up' succeeds, but it doesn't fix the problem of the mixed-rev working copy? If the latter, maybe your problem is similar to this report on Stackoverflow (related to a file external, which apparently makes svn see the working copy as mixed rev -- and the file external doesn't get updated to the uniform revision): http://stackoverflow.com/questions/5046075/unfixable-mixed-revision-working-copy-in-svn -- Johan