----------------------------------------
> Subject: Re: Keeping common files in trunk and branch identical
> From: blair_at_orcaware.com
> Date: Thu, 26 Nov 2009 07:42:34 -0800
> CC: users_at_subversion.tigris.org
> To: gaffe_1_at_live.com
>
>
> On Nov 26, 2009, at 6:10 AM, Asbjørrn Sæbø wrote:
>
>> I would like to have a branch for a different variant of our
>> software. In the branch, some of the files will be changed.
>> The other files I would like to keep identical between trunk
>> and the branch. [...]
> So you're looking for a feature where if any portion of a file
> has been changed in the branch then merges from the trunk for
> that file are not applied, even if the branch and trunk
> modifications affected different portions of the file?
NO, it was more the opposite, that if a file is _not_ changed,
it would actually _be_ the same file in both the trunk and the
branch. (Yes, I know SVN branches do not really make copies
until you write to the file in the branch, but that is not really
visible for the user. If you have module A in the trunk, and
also module A in the branch, you can not know (without diffing or
carefully checking logs) whether they are identical or not any
more, even if they have the same ancestor.
Actually, we do not do much merging between branches. In the
past, such operations have been somewhat painful, with
TortoiseSVN requireing some manual control and intervenation.
Also, how do you really track what has been merged here and
there?
ASbjørn Sæbø
_________________________________________________________________
Windows Live: Friends get your Flickr, Yelp, and Digg updates when they e-mail you.
http://www.microsoft.com/middleeast/windows/windowslive/see-it-in-action/social-network-basics.aspx?ocid=PID23461::T:WLMTAGL:ON:WL:en-xm:SI_SB_3:092010
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2424842
Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-11-27 14:31:21 CET