[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-01-15 22:04:22 CET

On Thu, 2004-01-15 at 14:48, Eric Gillespie wrote:

> Yes, and merge does in fact take the --dry-run option. That
> won't show you the diffs that are being merged, though (nor
> should it).

Okay, how about this proposal then? (The latest iteration from the
Chicago office:)

   1. diff defaults to ignoring ancestry (status quo)

   2. merge defaults to noticing ancestry (a tiny change)

   3. for dry-run merges, we tell people to use the existing 'merge
--dry-run' switch.

   4. we enhance the --dry-run option with an optional --verbose (-v).
If verbose, the dry-run shows actual diffs (which honor ancestry)
instead of showing status codes. (i.e. we end up calling 'svn diff'
under the hood.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 15 22:05:05 2004

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