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

RE: subtree merge -- solved I think

From: Jeremy Mordkoff <jlm_at_ZeeVee.Com>
Date: Tue, 6 Oct 2009 13:37:49 -0400

From: Jeremy Mordkoff [mailto:jlm_at_ZeeVee.Com] Sent: Tuesday, October 06,
2009 12:05 PM
> From: Tyler Roscoe [mailto:tyler_at_cryptio.net] Sent: Tuesday, October
06,
> 2009 11:20 AM
> > On Mon, Oct 05, 2009 at 08:38:30PM -0400, Jeremy Mordkoff wrote:
> > > Another developer was working in a project branch and merged to
> trunk,
> > > but he did the merge in the subdirectory 'ZV'. so now I have
> > >
> > > [release_at_zaz1 trunk]$ svn pg svn:mergeinfo .
> > > /zcode/branches/es_zvb_reset:9521-9652
> > > /zcode/branches/rel_2_1:8309-9633
> > > /zcode/branches/rel_2_2:9342-9705
> > > /zcode/branches/rel_2_2_1:9697-9706
> > >
> > > [release_at_zaz1 trunk]$ svn pg svn:mergeinfo ZV
> > > /zcode/branches/online/ZV:9220-9713
> > >
> > > Does this mean that the merge history for '.' will now be ignored
> when
> > > I'm merging 'ZV'? It does appear that way, because when I merged
> >
> > No. As I understand it, the merge process will first look at the
> > mergeinfo on ZV and then also look at the mergeinfo for anything
above
> > ZV (in your case, it will find the mergeinfo for trunk).
>
> That would make sense, but then it would appear to be broken, since
> according to the last line in the mergeinfo at the top, these changes
> had already been merged.
>

I think I found the problem. When the subtree merge was done, the
mergeinfo from the parent directory was not copied down. Not sure why,
but that does explain what I saw.

After fixing this manually, svn merge correctly ignored the changes made
on the branch I merged from the top.

The doc is a little confusing. On collabnet, there is a description of
searching upwards in the tree, but it is not clear if this search ends
on any instance of svn:mergeinfo or only on an instance with a reference
to the source path in question. I now believe the answer to be the
former, but I had initially assumed the latter. Also, I never saw any
reference to copying the mergeinfo down from a parent except by
implication in the example.

JLM

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-06 19:38:45 CEST

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