Re: Copy changes from one branch to another
Hi, thank you all for your input. I guess we are on the right track now. Thinking about what you said we will go the different way, instead of committing to branch A, the testsystem that should use branch A will pull all changes from the trunk. If there is a merge error we can handle this manually, however, this way around we guess it will be easier to automate. Thanks again, Sven On Mon, Sep 30, 2013 at 7:30 PM, Les Mikesell lesmikes...@gmail.com wrote: On Mon, Sep 30, 2013 at 12:13 PM, Bob Archer bob.arc...@amsi.com wrote: 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. 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. Yes, if different teams are working on different components, using externals is the way to go even if it takes some effort to arrange things into neat subdirectories for easy reference. Besides giving you a way to pull in the changes cleanly, it also gives you a way to version those points separately and each component can have its own release/tagging process and the consuming projects can adjust their references when they are ready. -- Les Mikesell lesmikes...@gmail.com
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
Re: Copy changes from one branch to another
Hi, On Mon, Sep 30, 2013 at 2:45 PM, Grierson, David david.grier...@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? Best Regards, Sven -Original Message- From: Sven Richter [mailto:sver...@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.
Re: Copy changes from one branch to another
Hi, On Mon, Sep 30, 2013 at 3:14 PM, Andrew Reedick andrew.reed...@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. Best Regards, Sven
