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

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

> "Sander Striker" <striker@apache.org> writes:
> > OLDER == BASELINE
> > YOURS == REPOS
> > MINE == WORKING COPY
> >
> > 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.

Sander

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