Re: How to maintain a release branch?

2016-11-14 Thread Mark Phippard
On Mon, Nov 14, 2016 at 6:59 AM, David Aldrich wrote: > Hi Stefan > > 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 t

Re: How to maintain a release branch?

2016-11-14 Thread Stefan Hett
Hi David, On 11/14/2016 12:59 PM, David Aldrich wrote: Hi Stefan 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 go

RE: How to maintain a release branch?

2016-11-14 Thread David Aldrich
Hi Stefan 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 la

Re: How to maintain a release branch?

2016-11-14 Thread Stefan Hett
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 release. We then maintain fixes for that release on that branch. Q1. As we apply fixes to the

Re: How to maintain a release branch?

2016-11-14 Thread Stefan Sperling
On Mon, Nov 14, 2016 at 10:45:25AM +, 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 release. > We then maintain fixes for that release on that branch. > > Q1. As

How to maintain a release branch?

2016-11-14 Thread David Aldrich
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 release. We then maintain fixes for that release on that branch. Q1. As we apply fixes to the release branch, should we also manually apply those fixe