Re: Merging confuses renamed files

Ben Collins-Sussman <sussman@collab.net> writes:

> So my proposal is to do the least surprsing thing in each case: 'svn
> diff' should ignore ancestry by default, and 'svn merge' should honor
> ancestry by default. (Of course we'd have switches to allow opposite
> behaviors.)
>
> Any objections to this?

I disagree, I think diff and merge should behave the same. (I think
they should both honour ancestry by default, but that didn't appear to
be popular last time this was dicussed.)

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org