[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: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2005-10-25 22:08:02 CEST

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.)

I'm undecided on whether -c N is worth consuming an option letter for or
if there are better syntaxes. I'm not likely to throw in a minus vote
at this point, though.

---------------------------------------------------------------------
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:11:28 2005

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.