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

Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL

From: Bradley Wagner <bradley.wagner_at_hannonhill.com>
Date: Thu, 2 Jul 2009 13:02:50 -0400

Hmm, I may have hit upon something. When executing this from the
command-line:

svn mergeinfo --show-revs=eligible ^/trunk

it returns: "svn: Retrieval of mergeinfo unsupported by '.'"

I'm definitely using svn 1.6 both in Eclipse and from the command line. Does
this mean my WC is old perhaps? I thought working copy upgrades were
automatic.

Thanks,
Bradley

On Thu, Jul 2, 2009 at 12:49 PM, Mark Phippard <markphip_at_gmail.com> wrote:

> On Thu, Jul 2, 2009 at 11:53 AM, Bradley
> Wagner<bradley.wagner_at_hannonhill.com> wrote:
> > So I upgraded to Eclipse 3.5 and can't for the life of me get the merge
> > client to work.
> >
> > I'm trying:
> > - Merge a range of revisions
> > - Merging from my project's trunk in to a WC branch and "Select revisions
> on
> > next page"
> > - After retrieving log entries for a long time, nothing ever appears on
> the
> > next screen. No available revisions or authors.
> >
> > Can't figure out if I'm doing something wrong. Is this type of merge not
> > intended for trunk to branch merges?
>
> Your working copy in Eclipse should be from your branch. On the
> wizard, you should have the proper URL from trunk specified as the
> merge source. We call a Subversion API to get the eligible revisions.
> If you want to try the command line, it would be something like:
>
> $ svn mergeinfo --show-revs=eligible ^/trunk
>
> Here is an easy recipe to test the feature.
>
> 1) Assume current HEAD revision for trunk is r300
> 2) Create a new branch by copying trunk. Specify r250 as the revision to
> copy
> 3) Switch your working copy to this new branch
> 4) Run the wizard. Revisions from 250-300 should show in the wizard.
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2367498
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subclipse.tigris.org].
>

-- 
Hannon Hill - CMS Experience You Can Trust
(678) 904-6900 ext 115
http://www.hannonhill.com
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2367500
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-07-02 19:03:06 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.