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

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

From: Stephen Colebourne <scolebourne_at_joda.org>
Date: Tue, 26 May 2009 08:40:19 -0700 (PDT)

> 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

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2353859

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-05-26 17:40:38 CEST

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