[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: Branko ─îibej <brane_at_xbc.nu>
Date: 2004-05-04 23:49:37 CEST

kfogel@collab.net wrote:

>Torsten Rueger <torsten.rueger@hiit.fi> writes:
>
>
>>and patch process should result in less conflicts. Even if you do it
>>on a line basis. But as I understand you use external patch, so that's
>>out of the question.
>>
>>
>
>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.

-- Brane

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 4 23:51:51 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.