[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: Paul Burba <ptburba_at_gmail.com>
Date: Fri, 1 Feb 2008 11:33:17 -0500

On Jan 31, 2008 9:18 PM, Mark Phippard <markphip_at_gmail.com> 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

As you suspected I wasn't able to recreate this problem with my own
simple test repos.

> 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.

Just thinking...

Assuming 'trunk' has no explicit mergeinfo. If we copy path 'trunk'
to 'branch' and run svn mergeinfo on branch we get this:

>svn mergeinfo branch
Path: branch

Is what you meant by "displays nothing"?

Maybe the default behavior in this case should be the same as is we
specified branch's copy source as the from source, e.g.:

>svn mergeinfo branch --from-source %trunkurl%
Path: branch
  Source path: /trunk
    Merged ranges:
    Eligible ranges: r2:9

Is that what you'd expect?

> I then did a --record-only merge of r1875 and committed. svn
> mergeinfo now somewhat works:
>
> $ svn mergeinfo
> Path: .
> Source path: /trunk
> Merged ranges: r1884:1885
> Eligible ranges: r1874:1884, r1885:2383
>
> But even after this, svn merge url://trunk still does nothing.
>
> Oddly, I do not get this problem when creating the merge tracking
> sample repository from scratch. Maybe something about doing a
> dump/load contributes to the problem? I do not currently have
> anything good I can give you to recreate.
>
> --
> 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
>
>

---------------------------------------------------------------------
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 17:33:31 CET

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