RE: [Subclipse-users] Merge multiple projects in one step?

I use the dialog all the time and it works fine (except of the multiple projects issue).

I remember seeing and deinstalling immediatelly the wizard a while ago as it was complicated and slow.
Will give it another try.

David Balažic
Software Engineer
www.comtrade.com

From: Mark Phippard [mailto:markphip_at_gmail.com]
Sent: 15. June 2015 18:45
To: users_at_subclipse.tigris.org
Subject: Re: [Subclipse-users] Merge multiple projects in one step?
Importance: Low

It sounds like you do not have the Merge Client plugin installed then. Either that, or in your SVN preferences you have changed the default for the merge provider.

Mark

On Mon, Jun 15, 2015 at 12:43 PM, David Balažic <david.balazic_at_comtrade.com<mailto:david.balazic_at_comtrade.com>> wrote:
I select a project, then context menu Team/Merge… and a dialog titled "Merge" appears.
It has not Next/Prev buttons, just a "Merge" button.

The projects I use have a common parent.

Regards,
David Balažic
Software Engineer
www.comtrade.com<http://www.comtrade.com>

From: Mark Phippard [mailto:markphip_at_gmail.com<mailto:markphip_at_gmail.com>]
Sent: 8. June 2015 18:53
To: users_at_subclipse.tigris.org<mailto:users_at_subclipse.tigris.org>
Subject: Re: [Subclipse-users] Merge multiple projects in one step?
Importance: Low

On Mon, Jun 8, 2015 at 12:37 PM, David Balažic <david.balazic_at_comtrade.com<mailto:david.balazic_at_comtrade.com>> wrote:
Is it possible to perform a merge on multiple projects in one step?

I there are 3 projects in a workspace (A, B and C) and someone does some changes on a branch, but only for B and C, is it possibl to do a single merge that will encompass both projects B and C?

You can select multiple projects and do a "single" merge. It has to internally still call the merge API once for each project you selected though. The selected projects should all have a logically common parent as some of the dialogs will be driven based on that parent.

I only see a way to right click one project, then do the merge on it, the repeat on the other project.

PS: What is the purpose of the third »Select…« button in the Merge dialog, next to the " The result of the merge is stored in the working copy at:" text?
It shows a history dialog, but selecting there a revision and clicking OK does not seem to have any effect.

Are you talking about the old Subclipse merge dialog or the wizard? If the latter, I cannot figure out what you are talking about. If the former ... you just should not use it. I am surprised if it even still works as to my memory it has not been touched since SVN 1.5 was released in 2008.

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