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

RE: Copy changes from one branch to another

From: Andrew Reedick <Andrew.Reedick_at_cbeyond.net>
Date: Mon, 30 Sep 2013 10:11:37 -0400

> -----Original Message-----
> From: Sven Richter [mailto:sveri80_at_googlemail.com]
> Sent: Monday, September 30, 2013 9:43 AM
> To: users_at_subversion.apache.org
> Subject: Re: Copy changes from one branch to another
> Hi,
> On Mon, Sep 30, 2013 at 3:14 PM, Andrew Reedick <Andrew.Reedick_at_cbeyond.net> wrote:
> >
> > Post commit script that deletes branch A and then recreates branch A from trunk, i.e. make branch A effectively a tag. Since the delete and copy are server side commands, no workspace is needed to make it work. However this will fail if (when) you need to make custom changes on branch A.
> But that has the effect that i will have all the changes from trunk in branch A, which is not what I want. I only want some certain changes inside there, the changes committed from our team.

Go with Thorsten Schöning's svn:externals solution. If you can't use svn:externals then you'll most likely need to merge, which requires a workspace and runs the risk of merge conflicts, which tends to preclude automation. Either way, be careful that you're not trying to replace a complicated workflow/process with overly simplistic automation, i.e. don't replace merging or a formal delivery process with mindless automated commit replication.
Received on 2013-09-30 16:14:24 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.