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

Re: Symmetric Merge

From: Branko Čibej <brane_at_apache.org>
Date: Tue, 27 Mar 2012 03:13:32 +0200

On 26.03.2012 13:11, Julian Foad wrote:
> Mike Dixon wrote:
>
>> It's nice that svn will be able to handle more complicated merges
>> in the future, but please don't remove the existing checks on standard
>> operations that protect me from my own ignorance.
>>
>> I'm also the svn administrator at $WORK, and I can promise you that my other
>> users understand the system even less well than I do. I'm not really looking
>> forward to having to disentangle a reintegrate that was applied to a WC with
>> switched subtrees.
> Thanks for commenting, Mike. That's exactly how I feel and you've said it better than I did.

Perhaps we had a bit of a misunderstanding here ... My point was, the
checks you mention have to always happen, not just optionally happen if
one uses the (by now quite misnamed) --reintegrate option. I'm not
arguing against sanity checks, quite the opposite, I'm arguing against
skipping them by default.

-- Brane
Received on 2012-03-27 03:13:39 CEST

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