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

Alan Shutko <ats@acm.org> writes:
> > Not even -- at least for me, it's been by far the least common case in
> > CVS merges
>
> All merges into your working copy (ie, updates) are 3-way merges,
> right? That seems a _really_ common use case.

Ah, good point. I wasn't counting those, but that's not fair, as they
are also merges (when there are local mods). With no local mods,
there is no advantage to 3-way, though we may as well do 3-way anyway.
Heck, one could apply the svndiff data directly. :-)

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