[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge from Trunk to Branch question

From: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: Fri, 6 Feb 2009 17:40:10 -0800

On Fri, Feb 6, 2009 at 5:05 PM, <clementw21_at_gmail.com> wrote:

> Suppose I have a file in the trunk (file1.c) and it is modified multiple
> times. i.e. It's version number will increase.
>
> The same file in the branch does not get modified.
>
> When I do a merge from trunk to branch what happens? My understanding is
> that file1.c in the branch will be modified to be the same as file1.c in the
> trunk and then I'll have to commit these changes to file1.c into the branch.
> Is this correct?
>
>

Yes, that is correct.

regards,
-Hari

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1115946

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-07 02:41:16 CET

This is an archived mail posted to the Subversion Users mailing list.