Re: 3 way merge algorithm

Branko Čibej <brane@xbc.nu> writes:
> >We use an internal diff/patch library now, in Subversion.
>
> To be pedantic, we don't actually use an internal patch
> implementation; that is, you can't apply a patch with "svn patch", or
> anything.

Sure. What I meant was: since svn can update to receive repos changes
into a locally modified file, we clearly have some sort of internal
patch implementation. Whether we call it "patch" or not, or make it
available as a subcommand, doesn't change that.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu May 6 19:00:37 2004