Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
From: Apache subversion Wiki <commits@subversion.apache.org>
To: Apache subversion Wiki <commits@subversion.apache.org>
Date: Thu, 02 Feb 2012 17:34:15 -0000
Message-ID: <20120202173415.74678.26125@eos.apache.org>
Subject: 
 =?utf-8?q?=5BSubversion_Wiki=5D_Update_of_=22SvnMergeTheory=22_by_JulianF?=
 =?utf-8?q?oad?=
Auto-Submitted: auto-generated

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" fo=
r change notification.

The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=3Ddiff&rev1=3D12&re=
v2=3D13

  =

  {{attachment:merge-reint-1.png|svn reintegrate merge}}
  =

- The main significant difference is that Subversion selects a base node th=
at is on the ''target'' branch rather than on the ''source'' branch.
+ The main significant differences are:
  =

- But what's the mergeinfo? [TODO...]
+  * For the 3-way merge, Subversion selects a base node that is on the ''t=
arget'' branch rather than on the ''source'' branch.
+  * For the mergeinfo, Subversion records all the changes along the source=
 branch (B), starting from 'O'.  That does not accurately descibe either th=
e set of logical changes (because B3 was not a logical change) or the set o=
f physical changes (because B1 and B2 were not physically merged; A2:B3 was=
 merged instead, which is logically equivalent).
  =

  =3D=3D 3-way or 4-way Merge =3D=3D
  Subversion currently performs any requested merge as a sequence of 3-way =
merges.  For simple ''sync'' and ''reintegrate'' merges, that's exactly wha=
t's needed.  Usually there is just one 3-way merge, but if cherry-picks are=
 being skipped then Subversion breaks down the merge source range into sub-=
ranges and performs one 3-way merge per sub-range.