PageRenderTime 64ms CodeModel.GetById 24ms RepoModel.GetById 1ms app.codeStats 0ms

/category/mercurial/1/index.html

https://github.com/charleso/charleso.github.com
HTML | 294 lines | 262 code | 32 blank | 0 comment | 0 complexity | e938dcd33a65c1c0cbd04ac409dfcf45 MD5 | raw file
    

  1. 

  2. 

  3. 

  4. <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
    5. 

  5.     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    6. 

  6. <html>
    7. 

  7.   <head>
    8. 

  8.     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
    9. 

  9.     
    10. 

  10.   <title>Plunkett</title>
    11. 

  11. <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="/feed" />
    12. 

  12. <link rel="alternate" type="application/atom+xml" title="Atom 1.0"
    13. 

  13. href="/feed/atom" />
    14. 

  14. <link rel='stylesheet' href='/css/pygments_murphy.css' type='text/css' />
    15. 

  15. <link rel='stylesheet' href='/css/site.css' type='text/css' />
    16. 

  16. 

  17. 

  18.   </head>
    19. 

  19.   <body>
    20. 

  20.     <div id="outer-wrapper">
    21. 

  21.     <div id="wrap2">
    22. 

  22.       
    23. 

  23.   <div id='header-wrapper'>
    24. 

  24. <div class='header section' id='header'><div class='widget Header' id='Header1'>
    25. 

  25. <div id='header-inner'>
    26. 

  26. <div class='titlewrapper'>
    27. 

  27. <h1 class='title'>
    28. 

  28. Plunkett
    29. 

  29. </h1>
    30. 

  30. </div>
    31. 

  31. 

  32. <div class='descriptionwrapper'>
    33. 

  33. <p class='description'><span>
    34. 

  34. </span></p>
    35. 

  35. </div>
    36. 

  36. </div>
    37. 

  37. </div></div>
    38. 

  38. </div>
    39. 

  39. 

  40.       <div id="content-wrapper">
    41. 

  41.         <div id="main-wrapper">
    42. 

  42.           <div id="main" class="main section">
    43. 

  43.           
    44. 

  44.   
    45. 

  45. <div class="post hentry">
    46. 

  46.   <a name="the-dvcs-wars"></a>
    47. 

  47.   <h3 class="post-title entry-title"><a href="/2009/08/git-vs-mercurial.html" rel="bookmark" title="Permanent Link to The DVCS Wars">The DVCS Wars</a></h2>
    48. 

  48.   <small>August 02, 2009 at 02:42 AM | categories: 
    49. 

  49. 

  50. <a href='/category/dvcs'>dvcs</a>, <a href='/category/mercurial'>mercurial</a>, <a href='/category/git'>git</a>
    51. 

  51.  | <a href="http://blog.charleso.org/2009/08/git-vs-mercurial.html#disqus_thread">View Comments</a>
    52. 

  52. </small><p/>
    53. 

  53.   <div class="post_prose">
    54. 

  54.     
    55. 

  55.   
    56. 

  56. What is it about us nerds that dictates every discussion must be a war of some
    57. 

  57. description? It isn't enough that we have two (or more) great technologies at
    58. 

  58. our disposal, we also have to fight about it and of-course we have to be 
    59. 

  59. <a href="http://xkcd.com/386/">right</a>. For example the age-old conflict between
    60. 

  60. Vi and Emacs seems to continue today, as passionately as ever. And why not?
    61. 

  61. There's nothing like a good ol' fashioned flame war to get the blood pumping.
    62. 

  62. <br /><br />
    63. 

  63. This post, in all fairness, should really be called "Why I switched from
    64. 

  64. Mercurial to Git". I actually quite like Mercurial and it was the original DVCS
    65. 

  65. that opened my eyes to a world beyond SVN. Upon first hearing about the
    66. 

  66. exciting  concept of DVCS I knew that I needed to get my hands on one ASAP. But
    67. 

  67. of course it couldn't just be <span>any</span> DVCS, it had to be the best one.
    68. 

  68. So I did some more reading, scoured blogs for any material I could find on the
    69. 

  69. topic so I could make the perfect choice. And I did. Only I picked the wrong
    70. 

  70. perfect one...
    71. 

  71. <br /><br />
    72. 

  72. Mercurial has so many good things going for it. The command line is clean and
    73. 

  73. simple, and for SVN escapees feels very much like home. It's written in Python,
    74. 

  74. which helps on Windows, and has a nice plugin architecture. In addition it has
    75. 

  75. a good balance of speed and size, not requiring any silly garbage collection.
    76. 

  76. Oh how I used to laugh at those poor Git fools, why couldn't they see the folly
    77. 

  77. of their ways. So what changed? I guess curiosity got the better of me. I read
    78. 

  78. <a href="http://www.rockstarprogrammer.org/post/2008/apr/06/differences-between-mercurial-and-git/">one</a>
    79. 

  79. <a href="http://thunk.org/tytso/blog/2007/03/24/git-and-hg/">too</a> many
    80. 

  80. pro-Git articles and realised I might just be missing something.
    81. 

  81. <br /><br />
    82. 

  82. What makes Git worth switching too then? In short, 
    83. 

  83. <a href="http://keithp.com/blogs/Repository_Formats_Matter/">the repository format</a>.
    84. 

  84. Everything else, in my opinion, is just porcelain. The defining moment for me
    85. 

  85. was when I learnt about
    86. 

  86. <a href="http://www.gitready.com/intermediate/2009/02/09/reflog-your-safety-net.html">reflog</a>.
    87. 

  87. So anything I commit is safely backed-up for 90 days regardless of what I do to
    88. 

  88. the visible history? Count me in!
    89. 

  89. <br /><br />
    90. 

  90. The safety net of Git's repository format in this respect is liberating.
    91. 

  91. Commands like rebase are not so much 'modifying history' as modifying your view
    92. 

  92. of history, because you can always retrieve the old version (within 90 days) if
    93. 

  93. you need it again. On the other hand when you modify the history in Mercurial
    94. 

  94. you <span>really are</span><span> </span>modifying the history. Whoops you've
    95. 

  95. just stripped that commit from your repository; I hope you made a backup. This
    96. 

  96. is one of those fundamental differences between Git and Mercurial, carefully
    97. 

  97. <a href="http://www.nabble.com/Advocacy-vs.-git-tp23221258p23226084.html">considered</a>
    98. 

  98. and implemented by their original designers. It means that in Git you have the
    99. 

  99. trade-off of having to run a gc occasionally to remove those pesky unused
    100. 

  100. objects. I'm cool with that if it means I get my reflog and a rebase that is
    101. 

  101. 100% refundable, no questions asked. I should hastily add that I've never
    102. 

  102. 'lost' a commit and I'm certainly not trying to suggest that Mercurial is
    103. 

  103. unsafe. For me personally it's about that extra layer of comfort and freedom
    104. 

  104. that Git provides.
    105. 

  105. <br /><br />
    106. 

  106. After that everything else seemed to just fall into place. I'd never really
    107. 

  107. liked Mercurial's (previous) answer to local branches:
    108. 

  108. <a href="http://mercurial.selenic.com/wiki/MqExtension">MQ</a>. Having to learn a
    109. 

  109. whole new set of commands to essentially do the same thing. I kept forgetting
    110. 

  110. which 'q' command did what. Why should I even <span>have </span>to remember
    111. 

  111. different commands, why can't I just commit and rebase later? Of course I'm
    112. 

  112. being simplistic here, and MQ is a very powerful tool, but what I really wanted
    113. 

  113. was a way to work as normal and <span> </span>decide 
    114. 

  114. <a href="http://tomayko.com/writings/the-thing-about-git"><span>later</span></a>
    115. 

  115. how to sync my changes.
    116. 

  116. <br /><br />
    117. 

  117. I find something strangely fascinating about version control, and I don't think
    118. 

  118. I'm the only one either. It seems to be a topic that draws an unusual amount of
    119. 

  119. attention, much to the
    120. 

  120. <a href="http://www.nabble.com/gnome-dvcs-survey-results-tp21297884p21368916.html">continual</a>
    121. 

  121. <a href="http://www.nabble.com/Re%3A-how-to-squash-commits-p23049314.html">annoyance</a>
    122. 

  122. of their creators I'm sure. Like everything in life, there is no absolute right
    123. 

  123. or wrong in regards to version control, as much as we'd like to argue there is
    124. 

  124. [1]. What is perfect for someone may be hell for another. Many people have
    125. 

  125. happily switched from Git to Mercurial, and while I think they're crazy I think
    126. 

  126. I understand why. My rookie mistake was not playing with all the alternatives
    127. 

  127. in the beginning. Git has turned out to be the ideal tool<span>
    128. 

  128. </span>for<span> me</span>; it compliments the way I work and think in a way
    129. 

  129. that Mercurial didn't or can't by design.
    130. 

  130. <br /><br />
    131. 

  131. [1] Unless of course you prefer Clearcase, in which case you're ugly and
    132. 

  132. stupid. :-P
    133. 

  133. 

  134. 

  135.   </div>
    136. 

  136. </div>
    137. 

  137. 

  138. 

  139. 

  140.   <div class="after_post"><a href="http://blog.charleso.org/2009/08/git-vs-mercurial.html#disqus_thread">Read and Post Comments</a></div>
    141. 

  141.   <hr class="interblog" />
    142. 

  142. 

  143.           </div>
    144. 

  144.         </div><!-- End Prose Block -->
    145. 

  145.         <div id="sidebar-wrapper">
    146. 

  146.         
    147. 

  147.   <div class="right_sidebar">
    148. 

  148.     <div id="sidebar" class="sidebar section">
    149. 

  149.   <h3>Me</h3>
    150. 

  150.   <ul>
    151. 

  151.     <li><a href="http://twitter.com/charlesofarrell/">Twitter</a></li>
    152. 

  152.     <li><a href="http://github.com/charleso/">Github</a></li>
    153. 

  153.     <li><a href="http://au.linkedin.com/in/charlesofarrell">Linkedin</a></li>
    154. 

  154.     <li><a href="http://cv.charleso.org/">CV</a></li>
    155. 

  155.   </ul>
    156. 

  156.   <h3>Blog Archive</h3>
    157. 

  157.   <ul>
    158. 

  158.     <li><a href="/2011/08/taste-of-scala.html">A Taste of Scala</a></li>
    159. 

  159.     <li><a href="/2011/05/java-is-the-new-cobol.html">Java is the new COBOL</a></li>
    160. 

  160.     <li><a href="/2011/05/blogofile.html">Blogofile</a></li>
    161. 

  161.     <li><a href="/2011/05/who-needs-documentation-anyway.html">Who needs documentation anyway?</a></li>
    162. 

  162.     <li><a href="/2011/05/java-logging.html">Java logging and per-user tracing</a></li>
    163. 

  163.     <li><a href="/2011/05/death-of-clearcase.html">Death of a Clearcase</a></li>
    164. 

  164.     <li><a href="/2009/08/git-vs-mercurial.html">The DVCS Wars</a></li>
    165. 

  165.     <li><a href="/2009/07/clearcase-strikes-back.html">ClearCase strikes back</a></li>
    166. 

  166.     <li><a href="/2008/10/clearcase-for-git.html">A Clearcase for Git</a></li>
    167. 

  167.     <li><a href="/2008/08/flex-o-matic.html">Flex-o-matic</a></li>
    168. 

  168.   </ul>
    169. 

  169.   <h3>Subscribe</h3>
    170. 

  170.   <ul>
    171. 

  171.     <li><a href="http://feeds.feedburner.com/charleso">Site RSS</a></li>
    172. 

  172.   </ul>
    173. 

  173.   <h3>Categories</h3>
    174. 

  174.   <ul>
    175. 

  175.     <li>
    176. 

  176.       <a href="/category/automated">automated&nbsp;(1)</a><!--a href="/category/automated/feed">rss</a-->
    177. 

  177.     </li>
    178. 

  178.     <li>
    179. 

  179.       <a href="/category/blogger">blogger&nbsp;(1)</a><!--a href="/category/blogger/feed">rss</a-->
    180. 

  180.     </li>
    181. 

  181.     <li>
    182. 

  182.       <a href="/category/blogofile">blogofile&nbsp;(1)</a><!--a href="/category/blogofile/feed">rss</a-->
    183. 

  183.     </li>
    184. 

  184.     <li>
    185. 

  185.       <a href="/category/clearcase">clearcase&nbsp;(3)</a><!--a href="/category/clearcase/feed">rss</a-->
    186. 

  186.     </li>
    187. 

  187.     <li>
    188. 

  188.       <a href="/category/cobol">cobol&nbsp;(1)</a><!--a href="/category/cobol/feed">rss</a-->
    189. 

  189.     </li>
    190. 

  190.     <li>
    191. 

  191.       <a href="/category/documentation">documentation&nbsp;(1)</a><!--a href="/category/documentation/feed">rss</a-->
    192. 

  192.     </li>
    193. 

  193.     <li>
    194. 

  194.       <a href="/category/dvcs">dvcs&nbsp;(2)</a><!--a href="/category/dvcs/feed">rss</a-->
    195. 

  195.     </li>
    196. 

  196.     <li>
    197. 

  197.       <a href="/category/flex">flex&nbsp;(1)</a><!--a href="/category/flex/feed">rss</a-->
    198. 

  198.     </li>
    199. 

  199.     <li>
    200. 

  200.       <a href="/category/git">git&nbsp;(4)</a><!--a href="/category/git/feed">rss</a-->
    201. 

  201.     </li>
    202. 

  202.     <li>
    203. 

  203.       <a href="/category/github">github&nbsp;(1)</a><!--a href="/category/github/feed">rss</a-->
    204. 

  204.     </li>
    205. 

  205.     <li>
    206. 

  206.       <a href="/category/java">java&nbsp;(3)</a><!--a href="/category/java/feed">rss</a-->
    207. 

  207.     </li>
    208. 

  208.     <li>
    209. 

  209.       <a href="/category/linux">linux&nbsp;(1)</a><!--a href="/category/linux/feed">rss</a-->
    210. 

  210.     </li>
    211. 

  211.     <li>
    212. 

  212.       <a href="/category/logback">logback&nbsp;(1)</a><!--a href="/category/logback/feed">rss</a-->
    213. 

  213.     </li>
    214. 

  214.     <li>
    215. 

  215.       <a href="/category/logging">logging&nbsp;(1)</a><!--a href="/category/logging/feed">rss</a-->
    216. 

  216.     </li>
    217. 

  217.     <li>
    218. 

  218.       <a href="/category/markup">markup&nbsp;(1)</a><!--a href="/category/markup/feed">rss</a-->
    219. 

  219.     </li>
    220. 

  220.     <li>
    221. 

  221.       <a href="/category/mercurial">mercurial&nbsp;(1)</a><!--a href="/category/mercurial/feed">rss</a-->
    222. 

  222.     </li>
    223. 

  223.     <li>
    224. 

  224.       <a href="/category/python">python&nbsp;(2)</a><!--a href="/category/python/feed">rss</a-->
    225. 

  225.     </li>
    226. 

  226.     <li>
    227. 

  227.       <a href="/category/restructuredtext">restructuredtext&nbsp;(1)</a><!--a href="/category/restructuredtext/feed">rss</a-->
    228. 

  228.     </li>
    229. 

  229.     <li>
    230. 

  230.       <a href="/category/scala">scala&nbsp;(1)</a><!--a href="/category/scala/feed">rss</a-->
    231. 

  231.     </li>
    232. 

  232.     <li>
    233. 

  233.       <a href="/category/svn">svn&nbsp;(1)</a><!--a href="/category/svn/feed">rss</a-->
    234. 

  234.     </li>
    235. 

  235.     <li>
    236. 

  236.       <a href="/category/wordpress">wordpress&nbsp;(1)</a><!--a href="/category/wordpress/feed">rss</a-->
    237. 

  237.     </li>
    238. 

  238.   </ul>
    239. 

  239. </div>
    240. 

  240.   </div>
    241. 

  241. 

  242.         </div>
    243. 

  243.         <div class="clear">&nbsp;</div>
    244. 

  244.       </div><!-- End Main Block -->
    245. 

  245.       <div id="footer">
    246. 

  246.         
    247. 

  247.   <p id="credits">
    248. 

  248. Powered by <a href="http://www.blogofile.com">Blogofile</a>.<br/>
    249. 

  249. <br/>
    250. 

  250. RSS feeds for <a href="http://feeds.feedburner.com/charleso">Entries</a>
    251. 

  251.  and <a
    252. 

  252. href="http://charleso.disqus.com/latest.rss">Comments</a>.
    253. 

  253. <br>
    254. 

  254. </p>
    255. 

  255. <script type="text/javascript">
    256. 

  256. //<![CDATA[
    257. 

  257. (function() {
    258. 

  258. 		var links = document.getElementsByTagName('a');
    259. 

  259. 		var query = '?';
    260. 

  260. 		for(var i = 0; i < links.length; i++) {
    261. 

  261. 			if(links[i].href.indexOf('#disqus_thread') >= 0) {
    262. 

  262. 				query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&';
    263. 

  263. 			}
    264. 

  264. 		}
    265. 

  265. 		document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/charleso/get_num_replies.js' + query + '"></' + 'script>');
    266. 

  266. 	})();
    267. 

  267. //]]>
    268. 

  268. </script>
    269. 

  269. 

  270. <script type="text/javascript">
    271. 

  271. //<![CDATA[
    272. 

  272.   var _gaq = _gaq || [];
    273. 

  273.   _gaq.push(['_setAccount', 'UA-23735205-1']);
    274. 

  274.   _gaq.push(['_trackPageview']);
    275. 

  275. 

  276.   (function() {
    277. 

  277.     var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
    278. 

  278.     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
    279. 

  279.     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
    280. 

  280.   })();
    281. 

  281. //]]>
    282. 

  282. </script>
    283. 

  283. 

  284. 

  285.       </div> <!-- End Footer -->
    286. 

  286.     </div> <!-- End Content -->
    287. 

  287.     </div>
    288. 

  288.   </body>
    289. 

  289. </html>
    290. 

  290. 

  291. 

  292. 

  293. 

  294. 

  295.