tag:blogger.com,1999:blog-28236292.post3749415011117756944..comments2022-11-14T06:26:53.200+00:00Comments on Crunchy: SVN Merging using SubClipseJohannes Woolardhttp://www.blogger.com/profile/11444047692360756346noreply@blogger.comBlogger11125tag:blogger.com,1999:blog-28236292.post-37087727940612419472012-10-16T16:52:31.100+01:002012-10-16T16:52:31.100+01:00I wrote step by step howto document to solve this ...I wrote step by step howto document to solve this problem <a href="http://chocotech.blogspot.com/2012/10/how-to-merge-two-svn-branch.html" rel="nofollow">http://chocotech.blogspot.com/2012/10/how-to-merge-two-svn-branch.html</a> :) Your post was very helpful, so I benefitted it during merging. Thanks.Sevalhttps://www.blogger.com/profile/04675114843320785342noreply@blogger.comtag:blogger.com,1999:blog-28236292.post-57140898344469760922010-06-20T17:23:33.261+01:002010-06-20T17:23:33.261+01:00This post is old, but it is going around Twitter t...This post is old, but it is going around Twitter today.<br /><br />Note that a shiny new merge wizard was added to Subclipse after this post was created. It is called the CollabNet Merge Client and is available on the Subclipse update site.<br /><br />Some details here:<br /><br />http://desktop-eclipse.open.collab.net/servlets/ProjectProcess?pageID=MEuUjbMark Phippardhttps://www.blogger.com/profile/16905022252385982106noreply@blogger.comtag:blogger.com,1999:blog-28236292.post-90832695877185618602010-02-11T09:53:36.438+00:002010-02-11T09:53:36.438+00:00Thanks a lot for your information. It has really h...Thanks a lot for your information. It has really helped me out doing the merging.Anonymousnoreply@blogger.comtag:blogger.com,1999:blog-28236292.post-29480933587742684712009-06-02T14:59:44.975+01:002009-06-02T14:59:44.975+01:00How do I merge in case other developers are workin...How do I merge in case other developers are working in <B>branches/dev1.1.0</B> and I (alone) am working on <B>branches/sit</B> but I want to merge to and fro?<br /><br /><BR><BR>(i.e., I should send my changes to dev1.1.0 and rececive their changes to mine)<br /><br />Please help. Thanks in advance.`Prabuhttps://www.blogger.com/profile/09467369820295878566noreply@blogger.comtag:blogger.com,1999:blog-28236292.post-89913649613817156472009-04-30T15:51:00.000+01:002009-04-30T15:51:00.000+01:00The problem I had centered around misunderstanding...The problem I had centered around misunderstanding "to" and "from". I thought that referred to the branches I was merging to and from. It doesn't. <br /><br />You always merge in the context of some workspace on your machine. It will be tied to some branch (or the trunk). That will be the "TO" branch.<br /><br />When you select to "merge" you have to pick the branch "FROM" which you are getting the changes to merge into your workspace.<br /><br />"to" and "from" on the merge dialog box refer to a range of revisions in the "FROM" branch. You don't always want to merge everything back to day 1 so you have to pick a start point and end point in the evolution of the branch (or its creation, if you prefer). That's what 'to' and 'from' mean there.LeeMeadorhttps://www.blogger.com/profile/15133279173465947034noreply@blogger.comtag:blogger.com,1999:blog-28236292.post-54725005203352854352009-01-07T04:26:00.000+00:002009-01-07T04:26:00.000+00:00So you do you manage a merge failure of a binary f...So you do you manage a merge failure of a binary file?<BR/><BR/>When you select edit conflicts it comes up with only an error dialog with a big red X in and - not even any text associated with it.<BR/><BR/>I end up with:<BR/>binary.file<BR/>binary.file.merge-left.rXXX<BR/>binary.file.merge-right.rXXX<BR/><BR/>I expect the merge to fail, as it can not (nor do I expect it to) manage the merging of binary files.<BR/><BR/>I can work out which one I want, but I've yet to work out how to get subclipse to allow me to manage the process. How/what do I select to resolve the differences?<BR/><BR/>The only means that I've worked out so far is deleting and renaming as appropriate - which is not pleasant!<BR/><BR/>-ChrisAnonymousnoreply@blogger.comtag:blogger.com,1999:blog-28236292.post-54549184458376443182008-12-30T10:53:00.000+00:002008-12-30T10:53:00.000+00:00One last tip: I find it useful to commit my branch...<I>One last tip: I find it useful to commit my branch just before merging changes: that way if something goes wrong I just have to hit Team -> Revert and everything is better again.</I><BR/><BR/>It's not just "useful" to commit before merge but pretty important for a relevant change history. If you've been working on a "red_button" branch, you only want the "red_button" stuff in your commit after the merge to trunk.Jaakko Siparihttps://www.blogger.com/profile/01210901593897371459noreply@blogger.comtag:blogger.com,1999:blog-28236292.post-40831887858092157982008-07-07T17:11:00.000+01:002008-07-07T17:11:00.000+01:00for Samuel's query - In the From Revison, select R...for Samuel's query - In the From Revison, select Revison check box and click on Show Log and select previous comitted version. In To Revision select Head Revison check box and hit Merge button.Anonymousnoreply@blogger.comtag:blogger.com,1999:blog-28236292.post-15045692474943481622007-12-04T16:06:00.000+00:002007-12-04T16:06:00.000+00:00You need to do the "Merge" operation on the branch...You need to do the "Merge" operation on the branch that you want to make the changes to. But you set the URL in the Merge dialog box to the URL of your branch where you made your changes in (this is the from part). <BR/><BR/>Basically, what happens is that a diff is made in your old working branch (for me, its branches/tomslocalchanges/), and the diff is attempted to be applied to the new branch (for me, its trunk/). <BR/><BR/>I would right click on trunk/ branch, and make the URL the branches/tomslocalchanges/ branch. <BR/><BR/>Hope this makes senseAnonymousnoreply@blogger.comtag:blogger.com,1999:blog-28236292.post-3868725708903366472007-06-25T14:12:00.000+01:002007-06-25T14:12:00.000+01:00Try to use the From Revison where you created your...Try to use the From Revison where you created your branch plus one.<BR/>And the to Revision the last one you have in the lookup. Than it should take all changes!Anonymousnoreply@blogger.comtag:blogger.com,1999:blog-28236292.post-91151647089521702722007-06-19T15:05:00.000+01:002007-06-19T15:05:00.000+01:00I don´t know why but when I do this process nothin...I don´t know why but when I do this process nothing happens. I know that I have made a lot o changes in my branch but when a try to merge it to the trunk nothing happens.Samuelhttps://www.blogger.com/profile/08012059020516065934noreply@blogger.com