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

Re: Some merge bugs in 1.5 branch

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 1 Feb 2008 17:05:16 -0500

On Feb 1, 2008 5:01 PM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
> Mark Phippard wrote:
> > I have a local copy of Subclipse repository. Dumped and Loaded with
> > 1.5.x branch build.
> >
> > I wanted to do a simple test of merge all eligible revisions. So I did this:
> >
> > HEAD is r2383
> >
> > svn cp -r 1874 url://trunk url://branches/feature-branch
> >
> > I should be able to checkout the feature branch and then do this:
> >
> > svn merge url://trunk
> >
> > And have the revisions 1874:2382 merged to the branch. Instead,
> > nothing happens. Bug #1
> >
> > svn mergeinfo displays nothing. I think this is because there is no
> > svn:mergeinfo property, but it seems like it should still show stuff.
> > Bug #2.
>
> This is not a bug. 'svn mergeinfo' will only show information about known
> merge sources (that is, sources recorded in svn:mergeinfo) unless you
> specify --from-source. This is by intentional. Of course, that your merge
> did nothing is interesting.

Yeah, I realized that after. I personally think the copy source
should be a special case. After all, we removed the mergeinfo for
that later and the copy source typically has merging significance.

> On IRC you indicated that the repository has svn:mergeinfo properties in it,
> possible from a bygone era when we created such at 'svn copy' time. I guess
> we can look into the cause of your particular problem (since neither Paul
> nor I could manufacture a similar scenario that didn't work as expected),
> but I betcha its that rogue mergeinfo that's causing the problems and is the
> difference between what you are messing with and what Paul and I are messing
> with.

The fact that svn mergeinfo did not report anything says to me there
probably are not any mergeinfo properties between my branch and the
root. Right? I will try to search the repository to see if any other
paths have it set.

I did a test with a second repository that did have some mergeinfo set
for certain. However, in that example, svn mergeinfo did show this
information.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-01 23:05:26 CET

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