{"id":92,"date":"2008-05-10T20:29:43","date_gmt":"2008-05-11T01:29:43","guid":{"rendered":"http:\/\/blog.red-bean.com\/sussman\/?p=92"},"modified":"2008-05-10T20:29:57","modified_gmt":"2008-05-11T01:29:57","slug":"subversion-15-merge-tracking-in-a-nutshell","status":"publish","type":"post","link":"http:\/\/blog.red-bean.com\/sussman\/?p=92","title":{"rendered":"Subversion 1.5 merge-tracking in a nutshell"},"content":{"rendered":"

As I’ve mentioned in other posts, the Subversion project<\/a> is on the verge of releasing version 1.5<\/a>, a culmination of nearly two years of work. The release is jam-packed with some huge new features, but the one everyone’s excited about is “merge tracking”.<\/p>\n

Merge-tracking is when your version control system keeps track of how lines of development (branches) diverge and re-form together. Historically, open source tools such as CVS and Subversion haven’t done this at all; they’ve relied on “advanced” users carefully examining history and typing arcane commands with just the right arguments. Branching and merging is possible, but it sure ain’t easy. Of course, distributed version control systems have now started to remove the fear and paranoia around branching and merging—they’re actually designed around merging as a core competency. While Subversion 1.5 doesn’t make it merging as easy as a system like Git or Mercurial, it certainly solves common points of pain. As a famous quote goes, “it makes easy things easy, and hard things possible.” Subversion is now beginning to match features in larger, commercial tools such as Clearcase and Perforce.<\/p>\n

My collaborators and I are gearing up to release a 2nd Edition<\/a> of the free online Subversion book soon (and you should be able to buy it from O’Reilly<\/a> in hardcopy this summer.) If you want gritty details about how merging works, you can glance over Chapter 4<\/a> right now, but I thought a “nutshell” summary would make a great short blog post, just to show people how easy the common case now is.<\/p>\n

    \n
  1. Make a branch for your experimental work:<\/b>
    \n
    \n$ svn cp trunkURL branchURL
    \n$ svn switch branchURL<\/p>\n

    <\/code>\n<\/li>\n

  2. Work on the branch for a while:<\/b>
    \n
    \n# ...edit files
    \n$ svn commit
    \n# ...edit files
    \n$ svn commit<\/p>\n

    <\/code>\n<\/li>\n

  3. Sync your branch with the trunk, so it doesn’t fall behind:<\/b>
    \n
    \n$ svn merge trunkURL
    \n--- Merging r3452 through r3580 into '.':
    \nU button.c
    \nU integer.c
    \n...<\/p>\n

    $ svn commit<\/p>\n

    <\/code>\n<\/li>\n

  4. Repeat the prior two steps until you’re done coding.<\/b>\n<\/li>\n
  5. Merge your branch back into the trunk:<\/b>
    \n
    \n$ svn switch trunkURL
    \n$ svn merge --reintegrate branchURL
    \n--- Merging differences between repository URLs into '.':
    \nU button.c
    \nU integer.c
    \n...<\/p>\n

    $ svn commit
    \n<\/code>\n<\/li>\n

  6. Go have a beer, and live in fear of feature branches no more.<\/b><\/li>\n<\/ol>\n

    Notice how I never<\/em> had to type a single revision number in my example: Subversion 1.5 knows when the branch was created, which changes need to be synced from branch to trunk, and which changes need to be merged back into the trunk when I’m done. It’s all magic now. This is how it should have been in the first place. \ud83d\ude42<\/p>\n

    Subversion 1.5 isn’t officially released yet, but we’re looking for people to test one of our final release candidate source tarballs<\/a>. CollabNet<\/a> has also created some nice binary packages for testing, as part of their early adopter program<\/a>. Try it out and report any bugs!<\/p>\n","protected":false},"excerpt":{"rendered":"

    As I’ve mentioned in other posts, the Subversion project is on the verge of releasing version 1.5, a culmination of nearly two years of work. The release is jam-packed with some huge new features, but the one everyone’s excited about is “merge tracking”. Merge-tracking is when your version control system keeps track of how lines […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[6,4],"tags":[],"class_list":["post-92","post","type-post","status-publish","format-standard","hentry","category-computers","category-subversion"],"_links":{"self":[{"href":"http:\/\/blog.red-bean.com\/sussman\/index.php?rest_route=\/wp\/v2\/posts\/92","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/blog.red-bean.com\/sussman\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/blog.red-bean.com\/sussman\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/blog.red-bean.com\/sussman\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/blog.red-bean.com\/sussman\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=92"}],"version-history":[{"count":0,"href":"http:\/\/blog.red-bean.com\/sussman\/index.php?rest_route=\/wp\/v2\/posts\/92\/revisions"}],"wp:attachment":[{"href":"http:\/\/blog.red-bean.com\/sussman\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=92"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/blog.red-bean.com\/sussman\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=92"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/blog.red-bean.com\/sussman\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=92"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}