Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
From: David Aldrich <David.Aldrich@EMEA.NEC.COM>
To: Stefan Hett <stefan@egosoft.com>,
        "users@subversion.apache.org"
	<users@subversion.apache.org>
Subject: RE: How to maintain a release branch?
Thread-Topic: How to maintain a release branch?
Thread-Index: AdI+Y/QhKI29pZvbSu6QegqP+BGo2AACVI4AAAA9lcA=
Date: Mon, 14 Nov 2016 11:59:43 +0000
Message-ID: <2eb23214dc5b47f1b6906c42454f1e60@EUX13SRV1.EU.NEC.COM>
References: <1de4f748d0174dafa2257fcb32429783@EUX13SRV1.EU.NEC.COM>
 <e4676638-0019-6c2e-549c-f6ddd5c49599@egosoft.com>
In-Reply-To: <e4676638-0019-6c2e-549c-f6ddd5c49599@egosoft.com>
Accept-Language: en-GB, en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
archived-at: Mon, 14 Nov 2016 11:59:56 -0000

Hi Stefan=20

Thanks for your reply.

> a) you manually apply changes to trunk and the release branch

One thing I've never been sure of with svn is whether manually applying the=
 same change (i.e. by edits not merges) on branch and trunk is a good idea.=
  Can that result in conflicts when merging later?

BR

David

> -----Original Message-----
> From: Stefan Hett [mailto:stefan@egosoft.com]
> Sent: 14 November 2016 11:50
> To: users@subversion.apache.org
> Subject: Re: How to maintain a release branch?
>=20
> Hi David,
> On 11/14/2016 11:45 AM, David Aldrich wrote:
> > Hi
> >
> > I would be grateful for some advice on how to maintain a release branch=
.
> >
> > Suppose we create a release branch, finalise the work and make the rele=
ase.
> We then maintain fixes for that release on that branch.
> >
> > Q1. As we apply fixes to the release branch, should we also manually ap=
ply
> those fixes to the trunk (where main development is proceeding)?
> That depends on what's best for your process... In principle three common
> approaches work:
> a) you manually apply changes to trunk and the release branch
> b) you apply the fix to trunk and merge (cherry-pick) the related revisio=
n to the
> release branch
> c) you apply the fix to the release branch and backport it (via merge) to=
 trunk
> (which can also be done in chunks at a given point
>=20
> We normally use approach b and have set up batch file which runs once per
> day to merge all flagged revisions (via a tag in the log message) which w=
ere
> committed to trunk to the release branch.
>=20
> > Q2. Does there come a point when one should merger the release branch
> back into the trunk (or does Q1 imply that this is unnecessary because we=
 have
> manually duplicated the changes in the trunk)?
> That heavily depends on your requirements. In general I don't see the nee=
d for
> that. One case where it would make sense would be if you also make change=
s
> to the release branch which you want to backported to trunk.
>=20
> > Q3. If we should merge the release branch back into the trunk, do we me=
rge
> from trunk to release branch first (I guess not because that would pollut=
e the
> branch)?
> Only if you want all the changes in trunk to get merged into the release
> branch. Based on your description, I take it that's not what you want.
> Hence, the answer is no.
>=20
> --
> Regards,
> Stefan Hett
>=20
>=20
>=20
>  Click
> https://www.mailcontrol.com/sr/Vj6aNZznnVPGX2PQPOmvUjekYHk5lulQevXi
> WVMqtR+Dmom+3B8m+QDuj+v!60mN2Cfu6uLF7dONc!rJiVGaJg=3D=3D  to report
> this email as spam.