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

Re: Merging confuses renamed files

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-08-22 20:32:48 CEST

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
Received on Fri Aug 22 20:33:49 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.