{"id":333,"date":"2008-01-03T23:33:15","date_gmt":"2008-01-03T13:33:15","guid":{"rendered":"http:\/\/www.erisian.com.au\/wordpress\/?p=333"},"modified":"2008-01-03T23:33:15","modified_gmt":"2008-01-03T13:33:15","slug":"tempus-fugit","status":"publish","type":"post","link":"https:\/\/www.erisian.com.au\/wordpress\/2008\/01\/03\/tempus-fugit","title":{"rendered":"tempus fugit"},"content":{"rendered":"<p>I blogged a fair bit about <a href=\"http:\/\/azure.humbug.org.au\/~aj\/blog\/tech\/darcs\/\">darcs<\/a> some time ago, but since then I&#8217;ve not been able to get comfortable with the patch algebra&#8217;s approach to dealing with conflicting merges &#8212; I think mostly because it doesn&#8217;t provide a way for the user to instruct darcs on how to recover from a conflict and continue on. I&#8217;ve had a look at bzr since then, but it just feels slow, to the point where I tend to rsync things around instead of using it properly, and it just generally hasn&#8217;t felt comfortable.<\/p>\n<p>On the other hand, a whole bunch of other folks I respect have been a bit more decisive than I have on this, and from where I sit, there&#8217;s been a notable trend:<\/p>\n<dl>\n<dt>Keith Packard, Oct 2006<\/dt>\n<dd><a href=\"http:\/\/keithp.com\/blogs\/Repository_Formats_Matter\/\">Repository formats matter<\/a>, <a href=\"http:\/\/keithp.com\/blogs\/Tyrannical_SCM_selection\/\">Tyrannical SCM selection<\/a><\/dd>\n<dt>Ted Tso, Mar 2007<\/dt>\n<dd><a href=\"http:\/\/thunk.org\/tytso\/blog\/2007\/03\/24\/git-and-hg\/\">Git and hg<\/a><\/dd>\n<dt>Joey Hess, Oct 2007<\/dt>\n<dd><a href=\"http:\/\/kitenet.net\/~joey\/blog\/entry\/git_transitions\/\">Git transitions<\/a>, <a href=\"http:\/\/kitenet.net\/~joey\/blog\/entry\/announcing_etckeeper\/\">etckeeper<\/a>, <a href=\"http:\/\/kitenet.net\/~joey\/blog\/entry\/git_archive_as_distro_package_format\/\">git archive as distro package format<\/a><\/dd>\n<dd>\n<p>Of course, Rusty <a href=\"http:\/\/ozlabs.org\/~rusty\/index.cgi\/tech\/2007-11-12.html\">swings the other way<\/a>, as do the <a href=\"http:\/\/www.opensolaris.org\/os\/community\/tools\/scm\/history\/\">OpenSolaris guys<\/a>. The OpenSolaris conclusions seem mostly out of date if you&#8217;re able to use git 1.5, and I haven&#8217;t learnt quilt to miss its mode of operation the way Rusty does. And as far as the basics go, Carl Worth did an interesting exercise in translating an <a href=\"http:\/\/hgbook.red-bean.com\/hgbookch2.html#x6-250002\">introduction to Mercurial<\/a> into <a href=\"http:\/\/cworth.org\/hgbook-git\/tour\/\">the equivalent for git<\/a>, so that looks okay for git too.<\/p>\n<\/dd>\n<\/dl>\n","protected":false},"excerpt":{"rendered":"<p>I blogged a fair bit about darcs some time ago, but since then I&#8217;ve not been able to get comfortable with the patch algebra&#8217;s approach to dealing with conflicting merges &#8212; I think mostly because it doesn&#8217;t provide a way for the user to instruct darcs on how to recover from a conflict and continue [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[16],"tags":[],"_links":{"self":[{"href":"https:\/\/www.erisian.com.au\/wordpress\/wp-json\/wp\/v2\/posts\/333"}],"collection":[{"href":"https:\/\/www.erisian.com.au\/wordpress\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.erisian.com.au\/wordpress\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.erisian.com.au\/wordpress\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.erisian.com.au\/wordpress\/wp-json\/wp\/v2\/comments?post=333"}],"version-history":[{"count":0,"href":"https:\/\/www.erisian.com.au\/wordpress\/wp-json\/wp\/v2\/posts\/333\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.erisian.com.au\/wordpress\/wp-json\/wp\/v2\/media?parent=333"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.erisian.com.au\/wordpress\/wp-json\/wp\/v2\/categories?post=333"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.erisian.com.au\/wordpress\/wp-json\/wp\/v2\/tags?post=333"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}