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

Re: RFC: change 'svn merge' default behavior.

From: Branko Čibej <brane_at_xbc.nu>
Date: 2004-01-15 23:34:28 CET

Sander Striker wrote:

>On Thu, 2004-01-15 at 18:25, Ben Collins-Sussman wrote:
>
>
>> so why include that
>>information?)
>>
>>So, we did the right thing: we made 'svn diff URL1 URL2' ignore
>>ancestry by default, and "dumbly" diff identical file paths.
>>
>>
>
>I still am not supporting this decission. svn diff TARGET1 TARGET2
>should indeed ignore history. However, svn diff -r X:Y TARGET should
>notice history.
>
+1, emphatically.

> Hmpf, we need that peg revision proposal implemented.
>
>
Yah, post-1.0 it seems, infortunately... I think this ommission will be
one of the more embarrasing sore thumbs in 1.0.

>
>
>> But in
>>the interest of consistency, folks decided that diff and merge should
>>behave the same. So both commands now ignore ancestry by default, and
>>require a long option to notice ancestry.
>>
>>
>
>Merging should always notice ancestry by default. The only time it
>is interesting to not notice ancestry is vendor branch merging. This
>should be uncommon enough to warrant --ignore-history.
>
>
Ditto +1

To the proposal: It totally wrong for either diff or merge to ignore
ancestry by default. This goes against the intent and spirit of
directory versioning. yes, diff output should note the different file names.

We have the 2-argument variants if you want to see the difference
between two unrelated files that happen to have the same name in
different revisions.

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 15 23:37:09 2004

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