On Tue, Mar 31, 2015 at 2:56 AM, Scott Aron Bloom <sc...@towel42.com> wrote: > > > > ~~Scott > > -------- Original message -------- > From: Johan Corveleyn <jcor...@gmail.com> > Date:03/30/2015 12:48 (GMT-08:00) > To: Scott Aron Bloom <sc...@towel42.com> > Cc: 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
