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

Re: Merge Architecture

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 8 Jan 2013 16:23:46 +0000 (GMT)

I (Julian Foad) wrote:
> Oh, and let's not forget 'patch'.  Patch looks roughly like this:
>    * read diff information from the patch file
>        --> merge this diff into the WC working/actual state
>        (patch-merge, like a 3-way merge; don't record mergeinfo;
>         record conflicts;  ...)
>    * run conflict resolver

As stsp pointed out on IRC, 'patch' does search & replace which is
pretty different from 3-way merge.  Thanks, Stefan, for pointing that

- Julian
Received on 2013-01-08 17:24:23 CET

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.