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 markphip
Full name Mark Phippard
Date 2009-05-26 09:04:45 PDT
Message On Tue, May 26, 2009 at 11:40 AM, Stephen Colebourne
<scolebourne at joda dot org> wrote:
>> 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?

Here is an example that shows the eligible revs from the Subclipse
trunk that can be merged to the Subclipse 1.4.x branch.

$ svn mergeinfo --show-revs=eligible
http://subclipse.tig​ris.org/svn/subclips​e/trunk/subclipse@HE​AD
http://subclipse.tig​ris.org/svn/subclips​e/branches/1.4.x/sub​clipse@HEAD

Subclipse runs the same API as this command and then has to follow it
up with a second API to get the details of those revisions. Basically
svn log -r HIGH:LOW


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

When you ran the merge to set the mergeinfo, was it something like this?

$ svn co url://server/repos/b​ranches/branch1
$ cd branch1
$ svn merge --record-only -r1:MAXREV ^/trunk

Where MAXREV is the max revision from trunk that you knew was merged
to the branch? You could really only use --record-only if you
typically fully-synch the trunk revisions to the branch and you knew
it had all of the trunk changes up to some revision.

Finally, keep in mind that SVN automatically knows the "natural
history" for a branch. So if it was created by coping trunk@1000, it
already knows that the branch contains r1-1000 from trunk.

--
Thanks

Mark Phippard
http://markphip.blogspot.com/

« Previous message in topic | 8 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: