tag:blogger.com,1999:blog-4222267598459829544.post3298006860052526977..comments2024-03-22T10:39:41.607-07:00Comments on Ben Lynn's Online Garbage: Spooked by a corrupt initrd imageBen Lynnhttp://www.blogger.com/profile/09117417699962852340noreply@blogger.comBlogger4125tag:blogger.com,1999:blog-4222267598459829544.post-16722480408044418632010-10-17T10:33:15.432-07:002010-10-17T10:33:15.432-07:00unrelated to this post.Could you give a small post...unrelated to this post.<br><br>Could you give a small post about using git for maintaining multiple releases of a software. (I;ve just had a look at your wonderful Git Branch Wizardry) but may need time to let that all seep in.<br><br>Version 1.1 is now maintenance. Version 1.2 has major changes, and will be backward incompatible.<br><br>(I use github, btw).rkumarhttp://www.blogger.com/profile/11183568411237322707noreply@blogger.comtag:blogger.com,1999:blog-4222267598459829544.post-65938792036987474302010-10-17T10:52:12.120-07:002010-10-17T10:52:12.120-07:00Following up on previous, I used the command: $ g...Following up on previous, I used the command:<br><br> $ git checkout 1bxxxx -b 1_1maint<br><br>to pick out the last commit of 1.1 and created a 1.1 maintenance branch.<br><br>So the first step is through ! :)rkumarhttp://www.blogger.com/profile/11183568411237322707noreply@blogger.comtag:blogger.com,1999:blog-4222267598459829544.post-68491585545147930992010-10-18T11:45:43.223-07:002010-10-18T11:45:43.223-07:00I'm guessing you'll be mostly working in 1...I'm guessing you'll be mostly working in 1.2, and occasionally you'll have minor fixes you want to give to version 1.1 as well.<br><br>In that case, if the code is sufficiently similar, in the 1.1 branch, you may be able to <b>git cherry-pick</b> the tiny bug-fix commits from 1.2.<br><br>Otherwise, if the code is rather different, perhaps the easiest solution is to <b>git apply</b> a patch (which you can create with git diff) and modify it by hand for 1.1 before committing.Ben Lynnhttp://www.blogger.com/profile/09117417699962852340noreply@blogger.comtag:blogger.com,1999:blog-4222267598459829544.post-49617633461958222092010-10-18T11:59:56.308-07:002010-10-18T11:59:56.308-07:00Another possibility is to switch to the 1.1 branch...Another possibility is to switch to the 1.1 branch every time you fix a 1.1 bug, and then switch back to the 1.2 branch, before merging the commits. However, I think this requires more discipline.Ben Lynnhttp://www.blogger.com/profile/09117417699962852340noreply@blogger.com