Login | Register
My pages Projects Community openCollabNet

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

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

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

Author beamer908
Full name Bradley Wagner
Date 2009-07-02 10:07:16 PDT
Message Ok, I think I understand. Our server is still running SVN 1.3.2. Will have
to switch back to the old merge client for now.

Thanks,
Bradley

On Thu, Jul 2, 2009 at 1:02 PM, Bradley Wagner <
bradley.wagner@hanno​nhill.com> wrote:

> 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 dot com> wrote:
>
>> On Thu, Jul 2, 2009 at 11:53 AM, Bradley
>> Wagner<bradley.wa​gner at hannonhill dot 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.tig​ris.org/ds/viewMessa​ge.do?dsForumId=1047​&dsMessageId=236​7498
>>
>> To unsubscribe from this discussion, e-mail: [
>> users-unsubscribe@su​bclipse.tigris.org].​
>>
>
Attachments
attachment-2705749

« Previous message in topic | 5 of 25 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
[Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 08:53:20 PDT
     Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 09:49:31 PDT
         Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 10:02:52 PDT
             Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 10:05:53 PDT
             Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 10:07:16 PDT
                 Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 10:08:51 PDT
                     Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 10:12:36 PDT
                         Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 10:31:39 PDT
                             Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 10:37:00 PDT
                                 Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 10:41:04 PDT
                                     Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 10:58:33 PDT
                                         Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 11:04:41 PDT
                                             Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 11:11:28 PDT
                                                 Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 11:17:26 PDT
                                                     Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 11:21:27 PDT
                                                         Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 11:24:07 PDT
                                                             Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 11:44:09 PDT
                                                                 Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 11:48:38 PDT
                                                                     Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 11:54:44 PDT
                                                                         Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 11:57:02 PDT
                                                                             Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-02 11:59:07 PDT
                                                                                 Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-02 12:01:22 PDT
                                     Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-04 09:08:35 PDT
                                         Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL markphip Mark Phippard 2009-07-04 09:42:38 PDT
                                     Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL beamer908 Bradley Wagner 2009-07-10 14:50:34 PDT
Messages per page: