tag:blogger.com,1999:blog-27232680.post6156633088331111672..comments2024-03-20T06:54:32.435+01:00Comments on Plastic SCM blog: Branching and merging strategiesF3RD3Fhttp://www.blogger.com/profile/11524626976811746062noreply@blogger.comBlogger10125tag:blogger.com,1999:blog-27232680.post-68366661764477482072013-03-08T21:38:21.184+01:002013-03-08T21:38:21.184+01:00Hi Pablo! The correct URL for the "Streamed L...Hi Pablo! The correct URL for the "Streamed Lines" branching patterns paper is http://www.bradapp.net/acme/branching<br /><br />It is actually a much more thorough coverage of branching than the SCM Patterns book because "Streamed Lines" focuses exclusively on branching patterns & pitfalls (almost 60 of them) whereas the SCM patterns book is more of an introduction, taking only the most commonly recurring branching patterns and putting them together with other version-control and build-mgmt related patterns.<br /><br />Brad Appletonhttps://www.blogger.com/profile/15136106921504315995noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-65290957835216765092011-08-19T16:01:16.426+02:002011-08-19T16:01:16.426+02:00Git does a fabulous job of branching & merging...Git does a fabulous job of branching & merging. I have worked with other source control systems like TFS & SVN.<br /><br />I have adopted a similar strategy using Git for about a year now and no major issues so far. They only thing is that you have to merge often.Rainmakernoreply@blogger.comtag:blogger.com,1999:blog-27232680.post-37306309617189175272011-05-27T08:51:39.621+02:002011-05-27T08:51:39.621+02:00@delacombo: merging these 4 branches back or not w...@delacombo: merging these 4 branches back or not will just depend on your development goals. I mean, are they separate developments, independent, which will be released separately? If so, maybe they don't need to be merged back.<br /><br />But, anyway, don't be afraid of merging... is much easier than you might think if you have the right tools, and you've them with Plastic.Pablo Santoshttps://www.blogger.com/profile/08083682682597484025noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-24368946977093532342011-05-27T00:41:46.754+02:002011-05-27T00:41:46.754+02:00Great post. I switched from Subversion to Git, and...Great post. I switched from Subversion to Git, and now to Plastic. I'm still fairly new to source control, so forgive me please, but with Plastic, do I need to worry about any merging? Especially as a sole developer using it at this time? For example, if I have 4 branches off the /main, do I need to merge the branches onto the /main line? Thanks!Jas Leehttps://www.blogger.com/profile/17834689463826940971noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-25325228910503152452010-05-14T22:41:00.308+02:002010-05-14T22:41:00.308+02:00Thanks for this post. I am setting up procedures ...Thanks for this post. I am setting up procedures for our team to use Plastic, and have relied heavily on this and the original diagram.<br /><br />Having actually tried it now, there is one thing I would change. Instead of creating the release branch as /main/develop/release1.0, create it as /main/release1.0 and then merge to it from /main/develop. This is an extra step, but avoids some non-intuitive behavior when any folder contents have changed on /main/develop.<br /><br />For more details about this, see the post titled "Integrating Grandchild Branch Loses Child Items" on the plasticscm forum.Unknownhttps://www.blogger.com/profile/17320857735651594873noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-86980837519977852092010-04-01T02:54:30.726+02:002010-04-01T02:54:30.726+02:00I totally agree about the changes... It's amaz...I totally agree about the changes... It's amazingly hard for someone to go even a step aside :)<br /><br />As for competing with git... There's one more factor here such as the price ;) A huge part of OSS success is about being free of charge - and that's something that is really had to beat.<br /><br />Here is Russia OSS is twice popular because for many companies (and therefore individuals) proprietary software costs too much to buy. Expecially when it's about some ClearCase-like things. I've been working with ClearCase for 3 years and it was provided by our contractior company.<br /><br />That's why you guys are doing a great job - making a SCM that is good enough to be actually sold. :)Aquaryhttps://www.blogger.com/profile/10690422971056030987noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-49786714731363060462010-04-01T02:06:43.012+02:002010-04-01T02:06:43.012+02:00True! In fact his Google speech was slashdotted li...True! In fact his Google speech was slashdotted linking to this blog actually! :-)<br /><br />We've tons of cases of people moving away from CVS, SVN, Perforce, Clearcase, VSS... We had a few cases of teams thinking whether to move to Git or Plastic, but that's unusual. It seems teams considering OSS tools won't consider commercial products (unless they hit some big issue) and viceversa.<br /><br />Moving away from Git into Plastic? I'd have to check but I don't think it's common. Consider the following: Git is brand new so if you just moved into it, you're not going to move away for two reasons (apply the same to SVN, CVS and even VSS!):<br /><br />- First you've just landed there so you won't consider a new move anytime soon<br />- Second, even if you feel like changing is hard for people to admit a mistake so they'll stick with their current SCM for a while (normally until the one who made the decission leaves!). Of course this better applied to really *limited* tools like VSS/CVS and even SVN (I've seen teams sticking to VSS for years, huge teams, and suffering on a daily basis until the guy in charge of the original decission left!). Git has nothing to do with CVS/VSS/SVN, it's much better, so unless you miss something too big you won't leave it soon.<br /><br />As a SCM developer I've the feeling Git is still on a different market than us (we don't have to compete against it ver often) but I really think it's a great system (Linus is a genius!!) and it obviously makes us work hard to put ourselves ahead of the game (which is not easy considering Git has probably more people working on it than we've! but so far I think we're doing a very good job) and come up with clear differences.<br /><br />What we obviously see is a much bigger interest on DVCS, which is very good for Plastic!Pablo Santoshttps://www.blogger.com/profile/08083682682597484025noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-66260198363807364792010-04-01T01:30:41.197+02:002010-04-01T01:30:41.197+02:00Well, I believe git first became popular because L...Well, I believe git first became popular because Linus himself made it and he presented it in Google ;) And *after* that people started realizing general advances of the things that he was advertizing :)<br />A few people (well, a few thousand people...) knew about DVCS before his speech.<br /><br />Now it's had for people to switch to something else - because git is the only true SCM for them :) <br /><br />Have you had any cases when people started using Plastic after git?Aquaryhttps://www.blogger.com/profile/10690422971056030987noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-23682784203582553552010-04-01T01:14:24.034+02:002010-04-01T01:14:24.034+02:00Yes, I totally share your view. Git is doing an ex...Yes, I totally share your view. Git is doing an excellent job explaining branching and merging to everybody. In fact I think what's really popular about Git is more its ability to do branching/merging better than SVN than its distributed capabilities.Pablo Santoshttps://www.blogger.com/profile/08083682682597484025noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-282906919159131482010-04-01T01:07:11.074+02:002010-04-01T01:07:11.074+02:00Although I'm not a fan of git, one extremely g...Although I'm not a fan of git, one extremely good thing that git helps with - it's a branching/merging popularization. Talking with people in forums I'm sometimes horribly surprized how they are literally *afraid* of branching and merging, making a bunch of "theories" about why branching is bad. That's amazingly stupid! And that's just because they use SVN which makes branching and merging a big pain in the buttocks.<br /><br />So some bad tools can completely break people's mind forcing them to avoid some good practices even when they switch to some good tool after a while.Aquaryhttps://www.blogger.com/profile/10690422971056030987noreply@blogger.com