[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Issue in svn E195020

From: Scott Aron Bloom <scott_at_towel42.com>
Date: Tue, 31 Mar 2015 00:56:23 +0000




~~Scott

-------- Original message --------
From: Johan Corveleyn <jcorvel_at_gmail.com>
Date:03/30/2015 12:48 (GMT-08:00)
To: Scott Aron Bloom <scott_at_towel42.com>
Cc: users_at_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.

>
> I can work with anyone necessary to fix this.. but right now, its making
> merging a nightmare./
>

If this is really problematic, you might want to use the option
--allow-mixed-revisions when you 'svn merge'.

--
Johan
--___
I have tried this, and it doesn't help.

Scott
Received on 2015-03-31 02:56:54 CEST

This is an archived mail posted to the Subversion Users mailing list.