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 Wiki <wikidiffs@apache.org>
To: Apache Wiki <wikidiffs@apache.org>
Date: Thu, 06 Oct 2011 15:56:16 -0000
Message-ID: <20111006155616.22336.88204@eos.apache.org>
Subject: 
 =?utf-8?q?=5BSubversion_Wiki=5D_Trivial_Update_of_=22SimpleAndSafeMerges?=
 =?utf-8?q?=22_by_JulianFoad?=
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 "SimpleAndSafeMerges" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SimpleAndSafeMerges?action=3Ddiff&rev1=3D=
7&rev2=3D8

  Discussed in [[http://svn.haxx.se/dev/archive-2011-09/0201.shtml|this ema=
il thread]].
  =

  =3D=3D Terminology - A Typical Branching and Merging Policy =3D=3D
- A  simple and useful branching policy.  This is presented here just in  o=
rder to give a framework of terminology for describing guidance  measures f=
or merging, not as a restriction on what is to be supported. Types of merge=
: * ''sync'' or ''catch-up'': a merge that pulls into the target branch all=
 source-branch changes that we =E2=80=9Cdon=E2=80=99t yet have=E2=80=9D in =
the target branch.
+ A  simple and useful branching policy.  This is presented here just in  o=
rder to give a framework of terminology for describing guidance  measures f=
or merging, not as a restriction on what is to be supported. Types of merge:
+ =

+  * ''sync'' or ''catch-up'': a merge that pulls into the target branch al=
l source-branch changes that we =E2=80=9Cdon=E2=80=99t yet have=E2=80=9D in=
 the target branch.
  =

   * ''cherry-pick'': a merge that pulls in one or more specified changes f=
rom the source branch.
+ =

   * ''reintegrate'': similar to a ''sync'' merge, but intended to be used =
in the other direction
  =

- Assume a partial ordering among branches, such that any given branch has =
(0 or more) ''Feature Branches'' that are less stable than it, and ''Releas=
e Branches'' that are more stable than it, and it is considered the ''paren=
t'' of each of those.  A merge may be performed between a ''parent'' branch=
 and one of its immediate ''Feature'' or ''Release'' branches, and nowhere =
else. * A merge to a ''Feature Branch'' from its ''parent'' is normally a '=
'catch-up''.
+ Assume a partial ordering among branches, such that any given branch has =
(0 or more) ''Feature Branches'' that are less stable than it, and ''Releas=
e Branches'' that are more stable than it, and it is considered the ''paren=
t'' of each of those.  A merge may be performed between a ''parent'' branch=
 and one of its immediate ''Feature'' or ''Release'' branches, and nowhere =
else.
+ =

+  * A merge to a ''Feature Branch'' from its ''parent'' is normally a ''ca=
tch-up''.
  =

   * A merge from a ''Feature Branch'' to its ''parent'' is normally a ''re=
integrate''.
+ =

   * A merge to a ''Release Branch'' from its ''parent'' is normally a ''ch=
erry-pick''.
+ =

   * A merge from a ''Release Branch'' to its parent could be a ''catch-up'=
' or a ''cherry-pick''. (### Does a catch-up work properly if you=E2=80=99v=
e done cherry-picks in the other direction? Might not.)
  =

  A merge to or from a ''Release Branch'' may be forbidden in one direction=
, according to local policy.