Login | Register
My pages Projects Community openCollabNet

Discussions > users > RE: Re: Re: Re: [Subclipse-users] Branch merge issues

subclipse
Discussion topic

Back to topic list

RE: Re: Re: Re: [Subclipse-users] Branch merge issues

Author scolebourne
Full name Stephen Colebourne
Date 2009-05-26 08:40:19 PDT
Message > I am not working in repositories that came from CVS, but I do use some
> that pre-dated the merge tracking feature. However, I've mostly
> worked with branches that I created post merge tracking. I just
> select all the projects in my workspace, right click and choose the
> merge option when I do it.
>
> The merge client does not have a bug in the revisions it shows, as it
> does not make the decisions. It calls a Subversion API that provides
> the revisions (equivalent to the svn mergeinfo command).

So, how do we find out what is wrong? Can I simulate this on the command line and provide more info?

> Even if SVN is showing the revisions, if the svn:mergeinfo property is
> set on the project it will not try to re-merge those revisions. I am
> not sure why it is showing them all, but it may be due to the
> svn:mergeinfo being set on the projects, as opposed to /trunk or
> /branches/branch1. Again, when the merge runs, it would self exclude
> the revisions.

I've tried it with the svn:mergeinfo only on /branch1, and on /branch1/eclipseprojecta and /branch1/eclipseprojectb. In both scenarios, a multiproject merge brings back every revision and takes a loong time.

Stephen

« Previous message in topic | 7 of 20 | Next message in topic »

Messages

Show all messages in topic

[Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-22 09:51:08 PDT
     Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-22 10:44:40 PDT
         RE: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-23 03:22:14 PDT
             Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-23 06:16:35 PDT
                 RE: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-26 06:26:32 PDT
                     Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-26 06:40:42 PDT
                         RE: Re: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-26 08:40:19 PDT
                             Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-26 09:04:45 PDT
                                 RE: Re: Re: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-27 05:34:45 PDT
                                     Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-27 10:31:26 PDT
                                     RE: Re: Re: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-27 10:45:26 PDT
                                         Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-27 10:51:19 PDT
                                             RE: Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-28 00:49:30 PDT
                                                 RE: Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-28 00:50:59 PDT
                                                 Re: Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-06-02 07:44:53 PDT
                                                     Re: Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-06-02 10:58:38 PDT
                                                         Re: Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-06-11 12:15:58 PDT
                 Re: Re: [Subclipse-users] Branch merge issues jcompagner jcompagner 2009-05-26 07:11:57 PDT
                     Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-26 07:25:53 PDT
                     Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-26 07:26:03 PDT
Messages per page: