Re: [Subclipse-users] MergeClient: getting all revisions of trunk when want to merge somehing of trunk to a branch

On Tue, Nov 17, 2009 at 10:34 AM, jcompagner <jcompagner_at_gmail.com> wrote:

> Last week we created a branch
> which is just a copy of the trunk folder (so all eclipse projects that are
> in /trunk are copied to /branches/Xxxx)
>
> In eclipse i checked out the branch folder so /branches/Xxxx and then
> created from the subfolders eclipse projects so that synchronize/updates are
> way faster (1 update command against 15+)
>
> then i made some commits on trunk again over multiply projects and commited
> those.
>
> Now i go back to the branch and i say to that eclipse project merge with
> /trunk
>
> Now getting the revisions takes ages.. :(
> And when it comes back i see that it got all the revisions from 1 to 26020
>
> The first question is why is that?

Did you specify the wrong path? Such as /trunk rather than /trunk/ProjectName?

Just guessing, as you know we do not control what comes back from the SVN API.

> That looks like an error to me because revision 1 -> 26000 (so excluding the
> last 20) is not what we want to merge because that is what the branch
> already is (its created at 26000)
> So it should only get revisions from the revision the branch is created of
> until now.

Correct.

> the second thing is even if it want to get that many shouldnt we make the
> merge client so that it only at first gets the top 20 (like history view)
> and only when a user presses get next it gets 20 more?
> Then that getting revisions is way faster then it is now.

We considered that when designing it. I felt it should get all the
eligible revisions. Unlike viewing history of a file, when merging it
seems just as likely that someone is going to want and older revision
as a newer one. And hopefully the SVN filtering of eligible revisions
is already reducing the list.

I do not think the fact that you incorrectly got back 26,000 revisions
you shouldn't have should factor into this.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2418982
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].