Re: more on svn diff / svn merge stuff

Branko Čibej <brane@xbc.nu> writes:
> No, it's not quite like that. A 3-way merge from A to B involves
> patching B with the diff between A and the closest common ancestor of
> A and B. This is what should happen when you merge two (related)
> branches.

Oh.

Okay, how does 3-way merge differ from the planned functionality of
"svn merge"?

> Your doc talks about adjusting the patch set for several successive
> merges. That's the next step beyond 3-way merging.

Ahead of my time, as usual. [sighs, brushes a lock of hair from in
front of his visionary eyes. dev list gags]

-K

---------------------------------------------------------------------
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:01 2006