Re: Merge multiple projects in one step?
Mark Phippard <[email protected]> Mon, 15 Jun 2015 12:45:22 -0400
| Newsgroups | gmane.comp.version-control.subversion.subclipse.user |
|---|---|
| Message-ID | <CAHFaGCrc-2AVgZgceqxV-fxmvsh2BmAZ7KgKrkcLYwMS0kYRag@mail.gmail.com> |
------=_Part_7011_1856625088.1434386726089 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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=C5=BEic <david.balazic@comtrad= e.com> wrote: > I select a project, then context menu Team/Merge=E2=80=A6 and a dialog t= itled > "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 > > > > *From:* Mark Phippard [mailto:[email protected]] > *Sent:* 8. June 2015 18:53 > *To:* [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@comtra= de.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, th= e > repeat on the other project. > > > > > > PS: What is the purpose of the third =C2=BBSelect=E2=80=A6=C2=AB button i= n 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 th= e > 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/ > --=20 Thanks Mark Phippard http://markphip.blogspot.com/ ------------------------------------------------------ http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=3D1047&dsMessageId= =3D3122792 To unsubscribe from this discussion, e-mail: [[email protected]= igris.org]. ------=_Part_7011_1856625088.1434386726089 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr">It sounds like you do not have the Merge Client plugin ins= talled then.=C2=A0 Either that, or in your SVN preferences you have changed= the default for the merge provider.<div><br></div><div>Mark</div></div><di= v class=3D"gmail_extra"><br><div class=3D"gmail_quote">On Mon, Jun 15, 2015= at 12:43 PM, David Bala=C5=BEic <span dir=3D"ltr"><<a href=3D"mailto:da= [email protected]" target=3D"_blank">[email protected]</a>&= gt;</span> wrote:<br><blockquote class=3D"gmail_quote" style=3D"margin:0 0 = 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <div lang=3D"SL" link=3D"blue" vlink=3D"purple"> <div> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1f497d">I select a project, then = context menu Team/Merge=E2=80=A6 and a dialog titled "Merge" appe= ars.<u></u><u></u></span></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1f497d">It has not Next/Prev butt= ons, just a "Merge" button.<u></u><u></u></span></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1f497d"><u></u>=C2=A0<u></u></spa= n></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1f497d">The projects I use have a= common parent.<u></u><u></u></span></p><span class=3D""> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1f497d"><u></u>=C2=A0<u></u></spa= n></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1f497d">Regards,<u></u><u></u></s= pan></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1f497d">David Bala=C5=BEic<u></u>= <u></u></span></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1f497d">Software Engineer<u></u><= u></u></span></p> </span><p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:&= quot;Calibri","sans-serif";color:#1f497d"><a href=3D"http://= www.comtrade.com" target=3D"_blank">www.comtrade.com</a><u></u><u></u></spa= n></p> <p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Ca= libri","sans-serif";color:#1f497d"><u></u>=C2=A0<u></u></spa= n></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:<a href=3D"mailto:markphip@gmai= l.com" target=3D"_blank">[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<u></u><u></u></span></p> </div> </div><div><div class=3D"h5"> <p class=3D"MsoNormal"><u></u>=C2=A0<u></u></p> <div> <p class=3D"MsoNormal">On Mon, Jun 8, 2015 at 12:37 PM, David Bala=C5=BEic = <<a href=3D"mailto:[email protected]" target=3D"_blank">david.b= [email protected]</a>> wrote:<u></u><u></u></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-right:0cm"> <div> <div> <p class=3D"MsoNormal">Is it possible to perform a merge on multiple projec= ts in one step?<u></u><u></u></p> <p class=3D"MsoNormal">=C2=A0<u></u><u></u></p> <p class=3D"MsoNormal">I there are 3 projects in a workspace (A, B and C) a= nd someone does some changes on a branch, but only for B and C, is it possi= bl to do a single merge that will encompass both projects B and C?<u></u><u></u></p> </div> </div> </blockquote> <div> <p class=3D"MsoNormal"><u></u>=C2=A0<u></u></p> </div> <div> <p class=3D"MsoNormal">You can select multiple projects and do a "sing= le" merge.=C2=A0 It has to internally still call the merge API once fo= r each project you selected though.=C2=A0 The selected projects should all = have a logically common parent as some of the dialogs will be driven based on that parent.<u></u><u></u></p> </div> <div> <p class=3D"MsoNormal"><u></u>=C2=A0<u></u></p> </div> <div> <p class=3D"MsoNormal">=C2=A0<u></u><u></u></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-right:0cm"> <div> <div> <p class=3D"MsoNormal">=C2=A0<u></u><u></u></p> <p class=3D"MsoNormal">I only see a way to right click one project, then do= the =C2=A0merge on it, the repeat on the other project.<u></u><u></u></p> <p class=3D"MsoNormal">=C2=A0<u></u><u></u></p> <p class=3D"MsoNormal">=C2=A0<u></u><u></u></p> <p class=3D"MsoNormal">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 t= he merge is stored in the working copy at:" text?<u></u><u></u></p> <p class=3D"MsoNormal">It shows a history dialog, but selecting there a rev= ision and clicking OK does not seem to have any effect.<u></u><u></u></p> <p class=3D"MsoNormal"><u></u>=C2=A0<u></u></p> </div> </div> </blockquote> <div> <p class=3D"MsoNormal"><u></u>=C2=A0<u></u></p> </div> <div> <p class=3D"MsoNormal">Are you talking about the old Subclipse merge dialog= or the wizard? If the latter, I cannot figure out what you are talking abo= ut.=C2=A0 If the former ... you just should not use it.=C2=A0 I am surprise= d if it even still works as to my memory it has not been touched since SVN 1.5 was released in 2008.<u></u><u></u></p> </div> <div> <p class=3D"MsoNormal">=C2=A0<u></u><u></u></p> </div> </div> <div> <p class=3D"MsoNormal"><u></u>=C2=A0<u></u></p> </div> <p class=3D"MsoNormal">-- <u></u><u></u></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><u></u><u></u></p> </div> </div> </div> </div></div></div> </div> </div> </blockquote></div><br><br clear=3D"all"><div><br></div>-- <br><div class= =3D"gmail_signature">Thanks<br><br>Mark Phippard<br><a href=3D"http://markp= hip.blogspot.com/" target=3D"_blank">http://markphip.blogspot.com/</a></div= > </div> ------=_Part_7011_1856625088.1434386726089--