[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: Sander Striker <striker_at_apache.org>
Date: 2002-02-15 19:34:48 CET

> From: Karl Fogel [mailto:kfogel@newton.ch.collab.net]
> Sent: 15 February 2002 19:09

> "Sander Striker" <striker@apache.org> writes:
> >
> > Does it make sense now? We do have access to all three files.
> No. I know we have access to three files (we always have), but I'm
> afraid these terms are not clarifying anything for me.
> Can you construct a concrete example?

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.

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.


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.