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

Re: Using temporary branches and mergeinfo properties

From: Stein Somers <ssomers_at_opnet.com>
Date: Fri, 27 Nov 2009 17:15:12 +0100

Igor Markovic wrote:
> - Now we need to merge the fixed bugs from the branch back to the trunk. (so we just merge revisions back to the trunk. Not the whole branch)

I guess sometimes it will be the whole branch anyway, because you merge
up all bug fixes, and sometimes it will be only some revisions, because
some bug fixes are being handled more fundamentally, right?

> This will cause all kind of mergeinfo properties on unchanged files.

No. Only if you merge parts of a revision: subdirectories or files in
changesets only. Avoid the need for that. When you fix bug A and bug B,
commit them separately so that you can merge the changes separately, but
still merge the whole changeset at once. Or if you do need to merge a
piece, keep track of it yourself and don't commit mergeinfo on the parts.

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2424885
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 17:16:20 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.