On 9/30/13 10:13 AM, Bob Archer bob.arc...@amsi.com wrote:
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
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
humans.
My 2c .. Hope this helps.
