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

Re: merging advice

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 5 Oct 2009 12:22:57 -0400

On Mon, Oct 5, 2009 at 12:01 PM, Jeremy Mordkoff <jlm_at_zeevee.com> wrote:

>> I would be concerned about all of those *.  That tells me you probably
>> did something like use a depth=empty working copy to record mergeinfo.
>>  The * tell Subversion the mergeinfo is not inheritable.  I'd probably
>> just edit the property to remove the * and then do not do it that way
>> again in the future.
>
> This is exactly what I did.
>
> Under /zcode/trunk we have about 9 subdirectories. Different projects use different subsets of these directories. When I was re-integrating the changes made in some branches, I only checked out the directories that were included in those checkouts. I goggled depth=none subversion merge and I did not see any warnings about this. Perhaps I did not read enough.
>
> At this moment, all branches have been re-integrated into trunk. Should I just remove all merge-info records across the board and start over using only fully populated work spaces? That will be a major pain in the rear since it will quadruple the space and time needed.

In your case, it sounds like the feature is working as intended and I
would not be worried.

Suppose you only worked on three of the nine subdirectories for your
project. If you do merges, Subversion is just recording for itself
that you did not have those other 6 subdirectory. This is so that
merge tracking would not block some other user that works in a
different project from being able to merge some of the same revisions
to those 6 subdirectories.

In your case, your svn:mergeinfo on trunk should have the *. But the
subtrees beneath the trunk should also have svn:mergeinfo for the same
revisions without the * (which indicates that you merged completely
into those trees). The subtrees that were not in your working copy
would not have any property value which would mean the same revisions
could still be merged into those.

This article has a ton of details and examples:

http://www.collab.net/community/subversion/articles/merge-info.html

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

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