RE: Merge multiple projects in one step?
David Balažic <[email protected]> Mon, 15 Jun 2015 18:59:55 +0200
| Newsgroups | gmane.comp.version-control.subversion.subclipse.user |
|---|---|
| Message-ID | <[email protected]> |
------=_Part_7107_1731636570.1434387602706 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I use the dialog all the time and it works fine (except of the multiple pro= jects issue). I remember seeing and deinstalling immediatelly the wizard a while ago as i= t was complicated and slow. Will give it another try. David Bala=C5=BEic Software Engineer www.comtrade.com From: Mark Phippard [mailto:[email protected]] Sent: 15. June 2015 18:45 To: [email protected] 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. Eit= her that, or in your SVN preferences you have changed the default for the m= erge provider. Mark On Mon, Jun 15, 2015 at 12:43 PM, David Bala=C5=BEic <david.balazic@comtrad= e.com<mailto:[email protected]>> wrote: I select a project, then context menu Team/Merge=E2=80=A6 and a dialog titl= ed "Merge" appears. It has not Next/Prev buttons, just a "Merge" button. The projects I use have a common parent. Regards, David Bala=C5=BEic Software Engineer www.comtrade.com<http://www.comtrade.com> From: Mark Phippard [mailto:[email protected]<mailto:[email protected]>] Sent: 8. June 2015 18:53 To: [email protected]<mailto:[email protected]> Subject: Re: [Subclipse-users] Merge multiple projects in one step? Importance: Low On Mon, Jun 8, 2015 at 12:37 PM, David Bala=C5=BEic <david.balazic@comtrade= .com<mailto:[email protected]>> 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 ch= anges 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 intern= ally still call the merge API once for each project you selected though. T= he selected projects should all have a logically common parent as some of t= he 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 =C2=BBSelect=E2=80=A6=C2=AB button in = the Merge dialog, next to the " The result of the merge is stored in the wo= rking copy at:" text? It shows a history dialog, but selecting there a revision and clicking OK d= oes 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=3D1047&dsMessageId= =3D3122798 To unsubscribe from this discussion, e-mail: [[email protected]= igris.org]. ------=_Part_7107_1731636570.1434387602706 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable <html xmlns:v=3D"urn:schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-micr= osoft-com:office:office" xmlns:w=3D"urn:schemas-microsoft-com:office:word" = xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" xmlns=3D"http:= //www.w3.org/TR/REC-html40"> <head> <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-8"> <meta name=3D"Generator" content=3D"Microsoft Word 14 (filtered medium)"> <style><!-- /* Font Definitions */ @font-face =09{font-family:"Cambria Math"; =09panose-1:2 4 5 3 5 4 6 3 2 4;} @font-face =09{font-family:Calibri; =09panose-1:2 15 5 2 2 2 4 3 2 4;} @font-face =09{font-family:Tahoma; =09panose-1:2 11 6 4 3 5 4 4 2 4;} /* Style Definitions */ p.MsoNormal, li.MsoNormal, div.MsoNormal =09{margin:0cm; =09margin-bottom:.0001pt; =09font-size:12.0pt; =09font-family:"Times New Roman","serif";} a:link, span.MsoHyperlink =09{mso-style-priority:99; =09color:blue; =09text-decoration:underline;} a:visited, span.MsoHyperlinkFollowed =09{mso-style-priority:99; =09color:purple; =09text-decoration:underline;} p.MsoAcetate, li.MsoAcetate, div.MsoAcetate =09{mso-style-priority:99; =09mso-style-link:"Balloon Text Char"; =09margin:0cm; =09margin-bottom:.0001pt; =09font-size:8.0pt; =09font-family:"Tahoma","sans-serif";} span.BalloonTextChar =09{mso-style-name:"Balloon Text Char"; =09mso-style-priority:99; =09mso-style-link:"Balloon Text"; =09font-family:"Tahoma","sans-serif"; =09mso-fareast-language:SL;} span.EmailStyle19 =09{mso-style-type:personal-reply; =09font-family:"Calibri","sans-serif"; =09color:#1F497D;} .MsoChpDefault =09{mso-style-type:export-only; =09font-family:"Calibri","sans-serif"; =09mso-fareast-language:EN-US;} @page WordSection1 =09{size:612.0pt 792.0pt; =09margin:72.0pt 72.0pt 72.0pt 72.0pt;} div.WordSection1 =09{page:WordSection1;} --></style><!--[if gte mso 9]><xml> <o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" /> </xml><![endif]--><!--[if gte mso 9]><xml> <o:shapelayout v:ext=3D"edit"> <o:idmap v:ext=3D"edit" data=3D"1" /> </o:shapelayout></xml><![endif]--> </head> <body lang=3D"SL" link=3D"blue" vlink=3D"purple"> <div class=3D"WordSection1"> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1F497D">I use the dialog all the = time and it works fine (except of the multiple projects issue).<o:p></o:p><= /span></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1F497D"><o:p> </o:p></span><= /p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1F497D">I remember seeing and dei= nstalling immediatelly the wizard a while ago as it was complicated and slo= w.<o:p></o:p></span></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1F497D">Will give it another try.= <o:p></o:p></span></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1F497D"><o:p> </o:p></span><= /p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1F497D">David Bala=C5=BEic<o:p></= o:p></span></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1F497D">Software Engineer<o:p></o= :p></span></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1F497D">www.comtrade.com<o:p></o:= p></span></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1F497D"><o:p> </o:p></span><= /p> <div style=3D"border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm = 4.0pt"> <div> <div style=3D"border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm = 0cm 0cm"> <p class=3D"MsoNormal"><b><span lang=3D"EN-US" style=3D"font-size:10.0pt;fo= nt-family:"Tahoma","sans-serif"">From:</span></b><span = lang=3D"EN-US" style=3D"font-size:10.0pt;font-family:"Tahoma",&qu= ot;sans-serif""> Mark Phippard [mailto:[email protected]] <br> <b>Sent:</b> 15. June 2015 18:45<br> <b>To:</b> [email protected]<br> <b>Subject:</b> Re: [Subclipse-users] Merge multiple projects in one step?<= br> <b>Importance:</b> Low<o:p></o:p></span></p> </div> </div> <p class=3D"MsoNormal"><o:p> </o:p></p> <div> <p class=3D"MsoNormal">It sounds like you do not have the Merge Client plug= in installed then. Either that, or in your SVN preferences you have c= hanged the default for the merge provider.<o:p></o:p></p> <div> <p class=3D"MsoNormal"><o:p> </o:p></p> </div> <div> <p class=3D"MsoNormal">Mark<o:p></o:p></p> </div> </div> <div> <p class=3D"MsoNormal"><o:p> </o:p></p> <div> <p class=3D"MsoNormal">On Mon, Jun 15, 2015 at 12:43 PM, David Bala=C5=BEic= <<a href=3D"mailto:[email protected]" target=3D"_blank">david.= [email protected]</a>> wrote:<o:p></o:p></p> <div> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><span style=3D"font-size:11.0pt;font-family:"Calibri",&q= uot;sans-serif";color:#1F497D">I select a project, then context menu T= eam/Merge=E2=80=A6 and a dialog titled "Merge" appears.</span><o:= p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><span style=3D"font-size:11.0pt;font-family:"Calibri",&q= uot;sans-serif";color:#1F497D">It has not Next/Prev buttons, just a &q= uot;Merge" button.</span><o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><span style=3D"font-size:11.0pt;font-family:"Calibri",&q= uot;sans-serif";color:#1F497D"> </span><o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><span style=3D"font-size:11.0pt;font-family:"Calibri",&q= uot;sans-serif";color:#1F497D">The projects I use have a common parent= .</span><o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><span style=3D"font-size:11.0pt;font-family:"Calibri",&q= uot;sans-serif";color:#1F497D"> </span><o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><span style=3D"font-size:11.0pt;font-family:"Calibri",&q= uot;sans-serif";color:#1F497D">Regards,</span><o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><span style=3D"font-size:11.0pt;font-family:"Calibri",&q= uot;sans-serif";color:#1F497D">David Bala=C5=BEic</span><o:p></o:p></p= > <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><span style=3D"font-size:11.0pt;font-family:"Calibri",&q= uot;sans-serif";color:#1F497D">Software Engineer</span><o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><span style=3D"font-size:11.0pt;font-family:"Calibri",&q= uot;sans-serif";color:#1F497D"><a href=3D"http://www.comtrade.com" tar= get=3D"_blank">www.comtrade.com</a></span><o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><span style=3D"font-size:11.0pt;font-family:"Calibri",&q= uot;sans-serif";color:#1F497D"> </span><o:p></o:p></p> <div style=3D"border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm = 4.0pt"> <div> <div style=3D"border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm = 0cm 0cm"> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"><b><span lang=3D"EN-US" style=3D"font-size:10.0pt;font-family:&quo= t;Tahoma","sans-serif"">From:</span></b><span lang=3D"EN-US"= style=3D"font-size:10.0pt;font-family:"Tahoma","sans-serif&= quot;"> Mark Phippard [mailto:<a href=3D"mailto:[email protected]" target=3D"_blank">m= [email protected]</a>] <br> <b>Sent:</b> 8. June 2015 18:53<br> <b>To:</b> <a href=3D"mailto:[email protected]" target=3D"_blank">= [email protected]</a><br> <b>Subject:</b> Re: [Subclipse-users] Merge multiple projects in one step?<= br> <b>Importance:</b> Low</span><o:p></o:p></p> </div> </div> <div> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto">On Mon, Jun 8, 2015 at 12:37 PM, David Bala=C5=BEic <<a href=3D= "mailto:[email protected]" target=3D"_blank">david.balazic@comtrad= e.com</a>> wrote:<o:p></o:p></p> <div> <div> <blockquote style=3D"border:none;border-left:solid #CCCCCC 1.0pt;padding:0c= m 0cm 0cm 6.0pt;margin-left:4.8pt;margin-top:5.0pt;margin-right:0cm;margin-= bottom:5.0pt"> <div> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto">Is it possible to perform a merge on multiple projects in one step= ?<o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto">I there are 3 projects in a workspace (A, B and C) and someone doe= s some changes on a branch, but only for B and C, is it possibl to do a sin= gle merge that will encompass both projects B and C?<o:p></o:p></p> </div> </div> </blockquote> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> </div> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto">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 b= ased on that parent.<o:p></o:p></p> </div> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> </div> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> </div> <blockquote style=3D"border:none;border-left:solid #CCCCCC 1.0pt;padding:0c= m 0cm 0cm 6.0pt;margin-left:4.8pt;margin-top:5.0pt;margin-right:0cm;margin-= bottom:5.0pt"> <div> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto">I only see a way to right click one project, then do the mer= ge on it, the repeat on the other project.<o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto">PS: What is the purpose of the third =C2=BBSelect=E2=80=A6=C2=AB b= utton in the Merge dialog, next to the " The result of the merge is st= ored in the working copy at:" text?<o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto">It shows a history dialog, but selecting there a revision and clic= king OK does not seem to have any effect.<o:p></o:p></p> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> </div> </div> </blockquote> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> </div> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto">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 t= he former ... you just should not use it. I am surprised if it even still works as to my memory it has not been touc= hed since SVN 1.5 was released in 2008.<o:p></o:p></p> </div> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> </div> </div> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto"> <o:p></o:p></p> </div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto">-- <o:p></o:p></p> <div> <p class=3D"MsoNormal" style=3D"mso-margin-top-alt:auto;mso-margin-bottom-a= lt:auto">Thanks<br> <br> Mark Phippard<br> <a href=3D"http://markphip.blogspot.com/" target=3D"_blank">http://markphip= .blogspot.com/</a><o:p></o:p></p> </div> </div> </div> </div> </div> </div> </div> </div> </div> <p class=3D"MsoNormal"><br> <br clear=3D"all"> <o:p></o:p></p> <div> <p class=3D"MsoNormal"><o:p> </o:p></p> </div> <p class=3D"MsoNormal">-- <o:p></o:p></p> <div> <p class=3D"MsoNormal">Thanks<br> <br> Mark Phippard<br> <a href=3D"http://markphip.blogspot.com/" target=3D"_blank">http://markphip= .blogspot.com/</a><o:p></o:p></p> </div> </div> </div> </div> </body> </html> ------=_Part_7107_1731636570.1434387602706--