[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: Bob Archer <bob.archer_at_amsi.com>
Date: Thu, 5 Feb 2009 10:29:24 -0500

> This brings me to a nagging question: Was it wrong to remove also the
> "root" mergeinfo in trunk? Trunk itself will of course never be merged
> back into something else.

It is my understanding (which could be wrong) that mergeinfo properties
are put on the target folder of the merge, no on the source.

So, if you merge a branch into trunk, then it is trunk that gets the
mergeinfo properties so it will know what has been merged into it. So,
removing mergeinfo from trunk means that svn has no idea what revisions
from your branches has already been merged in.

I think this bears out considering when you do a merge and commit it,
you are commiting the target of the merge (ie trunk) not the branch.

So, next time you do the merge for example from Branch/1 it will know
that Rev2345-Rev2377 have already been merged, so I'm just gonna diff
Rev2377-Head for this merge here.

BOb

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

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

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