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 <lesmikesell_at_gmail.com> wrote:
> On Mon, Sep 30, 2013 at 12:13 PM, Bob Archer <Bob.Archer_at_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
> lesmikesell_at_gmail.com
Received on 2013-10-01 08:51:24 CEST