[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-users
Subject:    Re: SVN branching and merging
From:       Daniel Becroft <djcbecroft () gmail ! com>
Date:       2010-09-29 20:52:57
Message-ID: AANLkTintv_0hc8a-MyNFvS-==5V6qMzyiP2pc9NB+z8L () mail ! gmail ! com
[Download RAW message or body]

On Thu, Sep 30, 2010 at 6:14 AM, Nigel Benns <nigelbenns@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.

[Attachment #3 (text/html)]

<div class="gmail_quote">On Thu, Sep 30, 2010 at 6:14 AM, Nigel Benns <span \
dir="ltr">&lt;<a href="mailto:nigelbenns@rogers.com">nigelbenns@rogers.com</a>&gt;</span> \
wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; \
border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">

<table border="0" cellpadding="0" cellspacing="0"><tbody><tr><td style="font: \
inherit;" valign="top">I have a question about SVN merge.<br>I would like to know if \
it is possible to do this with merging.<br><br>I would like a &quot;trunk&quot; to \
hold config files for an application.<br>

Then I would like 3 branches, dev, test and uat.<br><br>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.<br><br>

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.<br><br>Or something along these lines anyway....<br>Is anything like this \
possible with SVN?<br>

<br></td></tr></tbody></table></blockquote></div>Sure, we do a similar \
thing:<br><br>r2 -&gt; copy trunk to branches/dev<br>r3 -&gt; modify configuration in \
branches/dev<br><br>Unless a change is made to that line in /trunk, the change \
won&#39;t get removed during a merge. Will you be merging between branches? Ie, merge \
branches/dev to branches/test?<br>

<br>Cheers,<br>Daniel B.<br><div style="visibility: hidden; display: inline;" \
id="avg_ls_inline_popup"></div><style type="text/css">#avg_ls_inline_popup {  \
position:absolute;  z-index:9999;  padding: 0px 0px;  margin-left: 0px;  margin-top: \
0px;  width: 240px;  overflow: hidden;  word-wrap: break-word;  color: black;  \
font-size: 10px;  text-align: left;  line-height: 13px;}</style>



[prev in list] [next in list] [prev in thread] [next in thread]