On Thu, Sep 30, 2010 at 6:14 AM, Nigel Benns <nigelbenns_at_rogers.com> wrote:
> I have a question about SVN merge.
> I would like to know if it is possible to do this with merging.
>
> I would like a "trunk" to hold config files for an application.
> Then I would like 3 branches, dev, test and uat.
>
> I want the trunk branch to contain either no addresses or place holders for
> addresses and the branches to hold the addresses for their respective
> environments.
>
> I want to make all of the changes to the trunk, and then have the changes
> get copied to each of the branches and not have the branch specific
> information get removed.
>
> Or something along these lines anyway....
> Is anything like this possible with SVN?
>
> Sure, we do a similar thing:
r2 -> copy trunk to branches/dev
r3 -> modify configuration in branches/dev
Unless a change is made to that line in /trunk, the change won't get removed
during a merge. Will you be merging between branches? Ie, merge branches/dev
to branches/test?
Cheers,
Daniel B.
Received on 2010-09-29 22:54:01 CEST