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

Re: OpenOffice.org has migrated to subversion

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 5 Feb 2009 15:17:12 -0500

On Thu, Feb 5, 2009 at 11:52 AM, Jens-Heiner Rechtien
<Jens-Heiner.Rechtien_at_sun.com> wrote:

>> I'd have advised you not to do that, but I am inclined to think it
>> will be OK. You are probably going to need to cleanup the branches
>> though, else the old mergeinfo is going to make its way back to trunk.
>
> Yes, currently we remove the all the mergeinfo on trunk which comes in
> due to reintegration. This way we hope to keep trunk clean.

That is a little bit more worrisome. It could turn out to be fine
because you use a structured release engineering process and the
branching model you are using does not currently require this
information, but it does not feel right. At a minimum, you will lose
the log/blame -g feature as it needs to see the svn:mergeinfo
committed with the merge to know what was merged from where.

I thought you did a one-time "after the fact" cleanup. This would not
have broken log/blame because the cleanup would have happened in a
different revision than the commit.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1108997
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-05 21:18:03 CET

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