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

Re: "svn diff" and "svn merge" sittin' in a tree

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-02-15 19:55:27 CET

"Sander Striker" <striker@apache.org> writes:
> I think we are talking about different things, although they
> may apply to both. I'm talking about update and merging
> changes between the repos and the working copy, where the
> baseline is obviously the common ancestor.

Right. That's not what I'm talking about, although I see how it is
what you're talking about.

> You are already focussing on the branching and merging of
> branches, which can (in theory) be treated almost the same,
> since both branches do have a common ancestor.

Bingo! And that common ancestor is not directly used in the merge.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:08 2006

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.