[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: Rajesh Patwardhan <rajesh.patwardhan_at_gmail.com>
Date: Mon, 30 Sep 2013 10:20:54 -0700

On 9/30/13 10:13 AM, "Bob Archer" <Bob.Archer_at_amsi.com> wrote:

>> 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
>> 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.
>> Best Regards,
>> Sven
>Common stuff should be brought in with Externals rather than a merge.
>That may be a better use case considering what you are asking for.

  If I understood the question correctly Š
  then a contrarian approach is to not commit your Team A work to trunk
but rather to your Branch A and then merge up to trunk when you are ready
with your changes.
  That way branch A is what you need.
  With git this is the common workflow, with new subversion this should be
more easily possible. Any ways conflicts are \ will need to be resolved by
  My 2c .. Hope this helps.
Received on 2013-09-30 19:21:35 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.