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

Re: Add -c option to merge

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2005-10-25 22:18:54 CEST

Greg Hudson <ghudson@MIT.EDU> writes:

> On Tue, 2005-10-25 at 13:41 -0500, kfogel@collab.net wrote:
> > Sorry. I wasn't here for most of that discussion, I guess, which may
> > disqualify me (though not Mike) from objecting now. But I'd like to
> > know what the objection to overloading -r is...
>
> Well, -r N already has a meaning in "svn diff". Since this feature
> would be nice for diff as well as merge, it might be nice if we adopted
> a syntax which could work for both.
>
> (This is different from the argument that "merge has to be as much like
> diff as possible", which I think is weaker because the diffs you can
> take for a merge are a subset of the diffs you can take for a diff.
> Probably.)

Ah, ah, ah -- yes, I remember this now. So yeah, I think I'm fine
with the -c syntax (though, I still wouldn't oppose making 'svn merge
-rM' do something useful if there's a good candidate for utility).

-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 25 22:22:50 2005

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