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

Re: The new -c/--change option to complement -r/--revision

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2005-10-28 00:21:13 CEST

On Thu, 2005-10-27 at 20:10 +0100, Julian Foad wrote:
> Some people (not me) are proposing that "merge" should accept and apply a list
> of separate changes. If we end up making "merge" do this, then "diff" should
> do so too. I feel a bit uncomfortable about the idea, not being sure that it
> is well defined in all situations, but it's a possible future extension that
> can be discussed in detail when people want to discuss it.

It is well-defined when there are no conflicts.

The meaning of "svn diff -c A,B,C,D foo" is a diff between foo as of rev
A-1 and that same text with revs A, B, C, and D applied to it. If there
are any conflicts applying revs B, C, and D, we would presumably throw
an error.

This would be useful in the Subversion project when reviewing changes
for committing to a release branch. It sounds mildly difficult to
implement, though.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 28 00:23:00 2005

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