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

"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