[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: 3 way merge algorithm

From: <kfogel_at_collab.net>
Date: 2004-05-06 17:45:08 CEST

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

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.