Re: Merging confuses renamed files

On Fri, Aug 22, 2003 at 10:48:48AM -0500, Ben Collins-Sussman wrote:
>
> Here's my thoughts, which I think cmpilato now agrees with:
>
> * when you run 'svn diff', you don't care *how* the change came
> into being, you just want to see the net result to your working
> copy . Seeing a "delete foo; add foo" is completely annoying
> and useless -- especially in unified diff output.
>
> * when you 'svn merge' the exact same change to your working copy,
> you *want* to see the intent of the change. It's important to
> see a "D foo, A foo" displayed -- don't cover up this fact by
> displaying "U foo". It's a piece of useful information.
>
> 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?

Sounds reasonable to me, but I'm only a user.

-- 
Jamin W. Collins
Linux is not The Answer. Yes is the answer. Linux is The Question. - Neo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org