subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bob Archer <Bob.Arc...@amsi.com>
Subject RE: Copy changes from one branch to another
Date Mon, 30 Sep 2013 17:12:23 GMT
> On Mon, Sep 30, 2013 at 2:45 PM, Grierson, David
> <David.Grierson@bskyb.com> wrote:
> > Um ... why?
> Well, the way has come a long way and to reproduce it would take me a lot of
> time so i would please you and the others to just take it as given.
> 
> > Wouldn't this mean that trunk and branch A are identical at all times - in
> which case what's the purpose of branch A over trunk?
> Well, in case of our teams code base this is true. But our teams code base only
> makes up a small part of the whole trunk, so there are some dependencies
> (code and compiled libs) which are different in the two branches.
> And we do have to run tests against both branches to make sure it works with
> the different dependencies.
> Does that make sense?

Then this should not be automated. There is always the possibility of a conflict during the
merge, and a person will have to resolve those. 

BOb


> 
> Best Regards,
> Sven
> 
> >
> >> -----Original Message-----
> >> From: Sven Richter [mailto:sveri80@googlemail.com]
> >> Sent: 30 September 2013 13:29
> >> To: users@subversion.apache.org
> >> Subject: Copy changes from one branch to another
> >>
> >> Hi,
> >>
> >> I have the following setup
> >>
> >> trunk   branch A (created from trunk)
> >>  |             |
> >>  |             |
> >>  |             |
> >>
> >> Now, what I want to do is only commit my changes to the trunk and
> >> make sure that every committed change is replicated into branch A.
> >> This should be an automatic commit, triggered by the commit to trunk,
> >> while being aware of the fact that no other changes should be done in
> >> branch A but the autocommit from trunk.
> >> Another "would-like" requirement is that the commit metadata like
> >> author and commit time/date are kept, but this is not a must have.
> >>
> >> Is that possible with svn, maybe with autocommit hooks? If not, what
> >> other way would you see to achieve that?
> >>
> >> Best Regards,
> >> Sven
> >
> >
> > Information in this email including any attachments may be privileged,
> confidential and is intended exclusively for the addressee. The views expressed
> may not be official policy, but the personal views of the originator. If you have
> received it in error, please notify the sender by return e-mail and delete it from
> your system. You should not reproduce, distribute, store, retransmit, use or
> disclose its contents to anyone. Please note we reserve the right to monitor all
> e-mail communication through our internal and external networks. SKY and the
> SKY marks are trademarks of British Sky Broadcasting Group plc and Sky
> International AG and are used under licence. British Sky Broadcasting Limited
> (Registration No. 2906991), Sky-In-Home Service Limited (Registration No.
> 2067075) and Sky Subscribers Services Limited (Registration No. 2340150) are
> direct or indirect subsidiaries of British Sky Broadcasting Group plc
> (Registration No. 2247735). All of the companies mentioned in this paragraph
> are incorporated in England and Wales and share the same registered office at
> Grant Way, Isleworth, Middlesex TW7 5QD.
> >
> >

Mime
View raw message