Re: Bad interaction between merge and revert
From: Daniel Egger <degger_at_fhm.edu>
Date: 2004-07-31 19:10:53 CEST
On 31.07.2004, at 16:00, Ben Collins-Sussman wrote:
>> The only way to make this work reliably is to remove the WC and
> If you don't do this, then a repeat of the merge will try to re-add the
That's what I figured. :)
> So the proper algorithm is:
> svn merge
This might be faster than the recheckout but still has the problem
NB: I also have symbolic links in the tree which would need to be
> I admit, this bites people quite often, and has become a FAQ. I wonder
I don't think this would be worthwhile, I'd rather like to see the
An alternative would be to remove the distracting message and instead
Thanks for consideration!
This is an archived mail posted to the Subversion Dev mailing list.