Re: more on svn diff / svn merge stuff

On Wed, Jan 30, 2002 at 10:25:26PM +0100, Branko �ibej wrote:
> Karl Fogel wrote:
>
> >Just a brief progress report: the more I rework the code, the clearer
> >it is that we *will* be able to share a huge amount of code between
> >"svn diff" and "svn merge".
> >
> I'd be very surprised if that wasn't so.
>
> BTW; how about 3-way merges?

svn merge is always a 3-way merge. You specify a source and a target, and
the diff between those two are applied to the working copy (the third).

We just (hope to) have nice defaults for all three so that you don't always
have to specify them. For example, the WC path defaults to "." The source
defaults to when the target first came into existence (e.g. the branch was
created).

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org