History - Kiln » HgInit » HgInit

Kiln »

HgInit »

HgInit

Clone URL:

Pushed to one repository ·

View In Graph Contained in tip

tip initial

Changeset 227c14606159 …

by Benjamin Pollack <benjamin@fogcreek.com> Aug 2 11 at 8:54 PM

Changes to 246 files · Browse files at 227c14606159 Diff from another changeset...

Change 1 of 1 Show Entire File .hgignore Stacked
	1	@@ -0,0 +1,1 @@ +`glob:*.DS_Store`

Change 1 of 1 Show Entire File 00.html Stacked
	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307	@@ -0,0 +1,307 @@ +`<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">`+`<html xmlns="http://www.w3.org/1999/xhtml">`+`<head>`+`<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />`+`<title>HgInit: Subversion Re-education</title>`++`<script src="c/jquery-1.4.1.js"></script>`+`<script src="c/basic.js"></script>`++`<link href="c/styles.css" rel="stylesheet" type="text/css" />`+`<script type="text/javascript">`+`var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");`+`document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));`+`</script>`+`<script type="text/javascript">`+`try {`+`var pageTracker = _gat._getTracker("UA-225715-20");`+`pageTracker._setDomainName("none");`+`pageTracker._setAllowLinker(true);`+`pageTracker._trackPageview();`+`} catch(err) {}</script>`++`<!-- Google Website Optimizer Control Script -->`+`<script>`+`function utmx_section(){}function utmx(){}`+`(function(){var k='2687020024',d=document,l=d.location,c=d.cookie;function f(n){`+`if(c){var i=c.indexOf(n+'=');if(i>-1){var j=c.indexOf(';',i);return c.substring(i+n.`+`length+1,j<0?c.length:j)}}}var x=f('__utmx'),xx=f('__utmxx'),h=l.hash;`+`d.write('<sc'+'ript src="'+`+`'http'+(l.protocol=='https:'?'s://ssl':'://www')+'.google-analytics.com'`+`+'/siteopt.js?v=1&utmxkey='+k+'&utmx='+(x?x:'')+'&utmxx='+(xx?xx:'')+'&utmxtime='`+`+new Date().valueOf()+(h?'&utmxhash='+escape(h.substr(1)):'')+`+`'" type="text/javascript" charset="utf-8"></sc'+'ript>')})();`+`</script><script>utmx("url",'A/B');</script>`+`<!-- End of Google Website Optimizer Control Script -->`+`</head>`+`<body>`+`<div id="kilnFlyOut">`+`<div class="flyouttext">`+`<strong>Kiln gives you:</strong><br />`++`• A complete version control system`+`based on <a href="http://mercurial.selenic.com/" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/mercurial.selenic.com');">Mercurial</a><br />`+`• <a href="http://fogcreek.com/kiln/learnmore.html#hist_BranchAndMerge" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/branchandmerge.kilnhg.com');">Branching and merging</a> that really works`+`</div>`++`<div class="flyouttext">`+`• <a href="http://fogcreek.com/kiln/learnmore.html#hist_Tools" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/tools.kilnhg.com');">Straightforward setup</a> on your server, or simple secure hosting on ours<br />`+`• Seamlessly integrated <a href="http://fogcreek.com/kiln/learnmore.html#hist_StartReviewsEffortlessly" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/startreviews.kilnhg.com');">code review</a>`+`</div>`+`<div class="flyouttext"> <a href="convert.html" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/freetrial.shop.fogcreek.com');"><img src="i/getstarted.gif" width="182" height="24" border="0" /></a>`+`</div>`+`<div class="flyoutteaser"><nobr><strong>Try Kiln free!</strong> Mercurial hosting and more.</nobr></div>`+`</div>`+`<div class="toptop" align="left">`+`<ul>`+`<li align="center"><a href="http://www.joelonsoftware.com/" onClick="javascript: pageTracker._trackPageview('/outbound/toptop/joelonsoftware.com');">Joel on Software</a></li>`+`<li align="center"><a href="http://mercurial.selenic.com/" onClick="javascript: pageTracker._trackPageview('/outbound/toptop/mercurial.selenic.com');">Mercurial</a></li>`+`<li align="center"><a href="index.html">Home</a></li>`+`</ul>`+`</div>`+`<div id="dropshadow"></div>`+`<div id="topnav">`+`<div class="tInterior">`++`<a href="index.html">`+`<img src="i/logo.png" border="0" alt="HgInit Home" />`+`</a>`++`If you’ve been using Subversion, Mercurial is going to be confusing.`+`This tutorial covers the biggest differences in how Mercurial works.`+`If you’ve never used Subversion, just <a href="01.html">skip ahead</a>.`+`</div>`+`</div>`++`<div class="main">`++`<h1>`+`Subversion Re-education`+`</h1>`++`<div class="content">`++`<p>`+`When the programmers at my company decided to switch from Subversion to Mercurial, <em>boy</em> was I confused.`+`</p>`++<p>First, I came up with all kinds of stupid reasons why we shouldn’t switch. “We have to keep the repository on a central server, so it will be safe,” I said. You know what? I was wrong. In Mercurial every developer has a copy of the entire repository on their hard drive. It’s actually <em>safer</em>. And anyway, almost every Mercurial team uses a central repository, too, which you can back up compulsively, and you can build a three-ringed security zone complete with layers of Cylons, Stormtroopers, and adorable labradoodles (or whatever your IT department requires).</p>++`<p>“The trouble with distributed version control is that it makes it too easy to branch,” I said, “and branching always causes problems.” Turns out this was wrong, too. I was on a streak. Branching causes problems <em>in Subversion</em> because <em>Subversion</em> doesn’t store enough information to make <em>merging</em> work. In <em>Mercurial,</em> merging is painless and easy, and so branching is commonplace and harmless.</p>`++`<p>Then I said, “Fine, I’ll use it, but don’t expect me to be able to figure it out.” And I asked Jacob to make me a cheat sheet listing all the things that I normally did in Subversion, and the equivalent way to do them in Mercurial.</p>`++`<p>Now, I could show you this cheat sheet, but I won’t, because it messed up my brain for months.</p>`++`<p>It turns out that if you’ve been using Subversion, your brain is a little bit, um, how can I say this politely? You’re brain damaged. No, that’s not polite. You need a little re-education. I walked around brain damaged for six months thinking that Mercurial was <em>more</em> complicated than Subversion, but that was only because I didn’t understand how it really worked, and once I did, it turns out—hey presto!—it’s really kind of simple.</p>`++`<p>So I wrote this tutorial for you, in which I have been very careful <em>not</em> to explain things in terms of Subversion, because there is just no reason to cause any more brain damage. The world is brain damaged enough. Instead, for those of you who are coming from Subversion, I’ve got this one chapter at the beginning that will try to reverse as much damage as possible so that you can learn Mercurial from a clean slate.</p>`++`<p><strong>If you’ve never used Subversion, you can skip ahead to the next chapter (<a href="01.html">Ground Up Mercurial</a>) without missing anything.</strong></p>`++`<p>Ready? OK, let’s start with a short quiz.</p>`++`<p style="margin-left:2em;"><strong>Question 1.</strong> Do you write perfect code the first time?</p>`++`<p>If you answered “Yes” to question 1, you’re a liar and a cheat. You fail. Take the test again.</p>`++`<p>New code is buggy. It takes a while to get it working respectably. In the meantime, it can cause trauma for the other developers on the team.</p>`++`<p>Now, here’s how Subversion works:</p>`++`<ul>`+`<li>When you check new code in, everybody else gets it.</li>`+`</ul>`++`<p>Since all new code that you write has bugs, you have a choice.</p>`++`<ul>`+`<li>You can check in buggy code and drive everyone else crazy, or</li>`+`<li>You can avoid checking it in until it’s fully debugged.</li>`+`</ul>`++`<p>`+`Subversion always gives you this horrible dilemma. Either the repository is full of bugs because it includes new code that was just written, <em>or</em> new code that was just written is not in the repository.</p>`++`<p>As Subversion users, we are so used to this dilemma that it’s hard to imagine it not existing.</p>`++<p>Subversion team members often go days or weeks without checking anything in. In Subversion teams, newbies are terrified of checking any code in, for fear of breaking the build, or pissing off Mike, the senior developer, or whatever. Mike once got so angry about a checkin that broke the build that he stormed into an intern’s cubicle and swept off all the contents of his desk and shouted, “This is your last day!” (It wasn’t, but the poor intern practically wet his pants.)</p>++`<p>All this fear about checkins means people write code for weeks and weeks <em>without the benefit of version control</em> and then go find someone senior to help them check it in. Why have version control if you can’t use it?</p>`++`<p>Here’s a simple illustration of life under Subversion:</p>`++`<div class="i">`+`<img src="i/00-svn.png" />`+`</div>`++`<p>In Mercurial, <em>every developer has their own repository, living on their desktop:</em></p>`++`<div class="i">`+`<img src="i/00-hg.png" />`+`</div>`++`<p>So you can commit your code to your private repository, and get all the benefit of version control, whenever you like. Every time you reach a logical point where your code is a little bit better, you can commit it.</p>`++`<p>Once it’s solid, and you’re willing to let other people use your new code, you <em>push</em> your changes from your repository to a central repository that everyone else pulls from, and they finally see your code. When it’s ready.</p>`++`<p><em>Mercurial separates the act of committing new code from the act of inflicting it on everybody else.</em></p>`++`<p>And that means that you can commit (<strong>hg com</strong>) without anyone else getting your changes. When you’ve got a bunch of changes that you like that are stable and all is well, you push them (<strong>hg push</strong>) to the main repository.</p>`++`<h2>One more big conceptual difference</h2>`++`<p>You know how every single street has a name?</p>`++`<p><img src="i/00-tokyo.png" style="float:right; margin-left: 1em; margin-bottom: 1em; border: 1px solid black;" />Well, yeah, turns out that in Japan, not so much. They usually just number the <a href="http://sivers.org/jadr">blocks</a> in between the streets, and only very, very important streets get names.</p>`++`<p>There’s a similar difference between Subversion and Mercurial.</p>`++`<p>Subversion likes to think about <em>revisions</em>. A revision is what the entire file system looked like at some particular point in time.`+`</p>`++`<p>In Mercurial, you think about <em>changesets.</em> A changeset is a concise list of the changes between one revision and the next revision.</p>`++`<p>Six of one, half dozen of the other: what’s the difference?</p>`++`<p>Here’s the difference. Imagine that you and I are working on some code, and we branch that code, and we each go off into our separate workspaces and make lots and lots of changes to that code separately, so they have diverged quite a bit.</p>`++`<p>When we have to merge, Subversion tries to look at both revisions—my modified code, and your modified code—and it tries to guess how to smash them together in one big unholy mess. It usually fails, producing pages and pages of “merge conflicts” that aren’t really conflicts, simply places where Subversion failed to figure out what we did.</p>`++`<p>By contrast, while we were working separately in Mercurial, Mercurial was busy keeping a <em>series of changesets</em>. And so, when we want to merge our code together, Mercurial actually has a whole lot more information: it knows <em>what each of us changed</em> and can <em>reapply those changes</em>, rather than just looking at the final product and trying to guess how to put it together.</p>`++`<p>For example, if I change a function a little bit, and then move it somewhere else, Subversion doesn’t really remember those steps, so when it comes time to merge, it might think that a new function just showed up out of the blue. Whereas Mercurial will remember those things separately: function changed, function moved, which means that if you <em>also</em> changed that function a little bit, it is much more likely that Mercurial will successfully merge our changes.</p>`++`<p>Since Mercurial thinks of everything in terms of changesets, you get to do interesting things with those changesets. You can push them to a friend on the team to try them out, instead of pushing them to the central repository and inflicting them on everybody.</p>`++`<p>If this all seems a bit confusing, don’t worry—by the time you get through this tutorial, it’ll all make perfect sense. For now the most important thing to know is that because Mercurial thinks in terms of “changesets” instead of “revisions” <em>it can merge code much better than Subversion</em>.</p>`++`<p>And that means that <em>you can feel free to branch</em> because the merge isn’t going to be a nightmare.</p>`++<p>Want to know something funny? Almost every Subversion team I’ve spoken to has told me some variation on the very same story. This story is so common I should just name it “Subversion Story #1.” The story is this: at some point, they tried to branch their code, usually so that the shipping version which they gave their customers can be branched off separately from the version that the developers are playing with. And every team has told me that when they tried this, it worked fine, <em>until they had to merge</em>, and then it was a nightmare. What should have been a five minute process ended up with six programmers around a single computer working for two weeks trying to manually reapply every single bug fix from the stable build back into the development build.</p>++`<p>And almost every Subversion team told me that they vowed “never again,” and they swore off branches. And now what they do is this: each new feature is in a big #ifdef block. So they can work in one single trunk, while customers never see the new code until it’s debugged, and frankly, that’s ridiculous.</p>`++`<p>Keeping stable and dev code separate is <em>precisely what source code control is supposed to let you do</em>.</p>`++`<p>When you switch to Mercurial, you may not even realize it, but branching becomes possible again, and you don’t have to be afraid.</p>`++`<p>That means you can have team repositories, where a small team of programmers collaborates on a new feature, and when they’re done, they merge it into the main development repository, and <em>it works!</em></p>`++`<p>That means you can have a QA repository that lets the QA team try out the code. If it works, the QA team can push it up to the central repository, meaning, the central repository always has solid, tested code. And <em>it works!</em></p>`++`<p>That means you can run experiments in separate repositories, and if they work, you can merge them into the main repository, and if they don’t work, you can abandon them, and <em>it works!</em></p>`++`<h2>One last big conceptual difference</h2>`++`<p>The last major conceptual difference between Subversion and Mercurial is not as big a deal, but it will trip you up if you’re not aware of it, and here it is:</p>`++`<p>Subversion is basically revision control for <em>files,</em> but in Mercurial, revision control always applies to an entire directory—including all subdirectories.</p>`++<p>The main way you notice this is that in Subversion, if you go into a subdirectory and commit your changes, it only commits changes in that subdirectory and all directories below it, which potentially means you’ve forgotten to check something in that lives in some other subdirectory which also changed. Whereas, in Mercurial, all commands always apply to the entire tree. If your code is in <strong>c:\code</strong>, when you issue the <strong>hg commit</strong> command, you can be in <strong>c:\code</strong> or in <em>any subdirectory</em> and it has the same effect.</p>++`<p>This is not a big deal, but if you’re used to having one big gigantic repository for the whole company, where some people only check out and work on subdirectories that they care about, this isn’t a very good way to work with Mercurial—you’re better off having lots of smaller repositories for each project.</p>`++`<h2>And finally…</h2>`++`<p>Here’s the part where you’re just going to have to take my word for it.</p>`++`<p>Mercurial is better than Subversion.</p>`++`<p>It is a better way of working on source code with a team. It is a better way of working on source code by yourself.</p>`++`<p>It is just <em>better.</em></p>`++`<p>And, mark my words, if you understand the way Mercurial works, and you work the way Mercurial works, and you don’t try to fight it, and you don’t try to do things the old Subversion way using Mercurial but instead you learn to work the way Mercurial expects you to work, you will be happy, successful, and well-fed, and you’ll always be able to find the remote control to the TV.</p>`++`<p>And in the early days, you will be tempted, I know you will, to give up on Mercurial and go back to Subversion, because it will be strange, like living in a foreign country, and you’ll be homesick, and you will come up with all kinds of rationalizations, like, for example, you will claim that Mercurial working directories take up too much disk space, which is bologna, because, actually, they usually take up less space than Subversion directories. (It’s true!)</p>`++`<p>And then you’ll go back to Subversion because you tried to branch the Subversion way, and you got confused, and it didn’t work so well, because you really should have been branching the Mercurial way, by cloning repositories, not by trying to do the things that work in Subversion, but by learning the Mercurial way of doing things, which, trust me, <em>works.</em></p>`++`<p>And then you’ll get Jacob, or whoever the equivalent of Jacob is at your office, to give you the “Subversion to Mercurial cheat sheet,” and you’ll spend three months thinking that <strong>hg fetch</strong> is just like <strong>svn up</strong>, without really knowing what <strong>hg fetch</strong> does, and one day, things will go wrong and you’ll blame Mercurial, when you really should be blaming yourself for not understanding how Mercurial works.</p>`++`<p>I know you’ll do that because that is what I did.</p>`++<p>Don’t make the same mistake. Learn Mercurial, trust Mercurial, and figure out how to do things the Mercurial way, and you will move an entire generation ahead in source code control. While your competitors are busy taking a week to resolve all the merge conflicts they got when a vendor updated a library, you’re going to type <strong>hg merge</strong> and say to yourself, “Oh gosh, that’s cool, it just worked.” And Mike will chill out and share a doobie with the interns, and soon it will be spring and the kids at the nearby college will trade in their heavy parkas for skimpy A&F pre-torn T-shirts, and life will be good.</p>+++`<div class="footer">`+`<div class="footernav" id="home" align="center"><a href="index.html"><span class="angleQuote">«</span> Home</a></div>`+`<div class="footernav" id="comingup">Coming up: Mercurial<br />from the ground up.</div>`+`<div class="footernav" id="next" align="center"><a href="01.html">Next <span class="angleQuote">»</span></a></div>`+++`</div>`+`<div class="pagebottom">`++`<div class="bottomimg">`+`<a href="http://www.kilnhg.com" target="_blank" id="logoLink" title="KilnHg.com" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/klinhg.com');"> </a>`+`<div class="bottomtext">This tutorial was brought to you by the fine folks at Fog Creek Software, makers of Kiln, a version control system powered by Mercurial</div>`++`<div class="bottomtext"><strong>Kiln gives you:</strong><br />`++`• A complete version control system based on <a href="http://mercurial.selenic.com/" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/mercurial.selenic.com');">Mercurial</a><br />`+`• <a href="http://fogcreek.com/kiln/learnmore.html#hist_BranchAndMerge" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/branchandmerge.kilnhg.com');">Branching and merging</a> that really works<br />`+`• <a href="http://fogcreek.com/kiln/learnmore.html#hist_Tools" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/tools.kilnhg.com');">Straightforward setup</a> on your server, or simple secure hosting on ours<br />`+`• Seamlessly integrated <a href="http://fogcreek.com/kiln/learnmore.html#hist_StartReviewsEffortlessly" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/startreviews.kilnhg.com');">code review</a><br />`+`</div>`++`<div class="bottomtext getStarted">`+`<a href="convert.html" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/freetrial.shop.fogcreek.com');"><img src="i/getstarted.gif" width="182" height="24" border="0" /></a>`+`</div>`++`</div>`+`<div class="about">`++`<p>`+`<strong>Any questions?</strong>`+`</p>`++`<p>`+`If you have any questions about the material in this tutorial,`+`no matter how newbie, ask them at <a href="http://kiln.stackexchange.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/kiln.stackexchange.com');">the`+`Kiln Knowledge Exchange.</a>`+`</p>`++`<p>`+`<strong>About the author.</strong>`+`</p>`++`<p>`+Joel Spolsky is the founder of <a href="http://fogcreek.com" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/fogcreek.com');">Fog Creek Software</a>, a New York company that proves that you can treat programmers well and still be profitable. Programmers get private offices, free lunch, and work 40 hours a week. Customers only pay for software if they’re delighted. Fog Creek makes <a href="http://www.fogbugz.com" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/fogbugz.com');">FogBugz</a>, <a href="http://www.kilnhg.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/text.kilnhg.com');">Kiln</a>, and <a href="https://www.copilot.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/copilot.com');">Fog Creek Copilot</a>. Joel's blog <a href="http://www.joelonsoftware.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/joelonsoftware.com');">Joel on Software</a> is read by programmers everywhere.++`</p>`++`</div>`+++`<!-- close bottom div -->`+`</div>`+++`<!-- close "content" column -->`+`</div>`++`<!-- close "main" div -->`+`</div>`++`<!-- bottom grey bar -->`+`<div class="botbot" align="left">`+`</div>`++`<!-- Google Website Optimizer Tracking Script -->`+`<script type="text/javascript">`+`if(typeof(_gat)!='object')document.write('<sc'+'ript src="http'+`+`(document.location.protocol=='https:'?'s://ssl':'://www')+`+`'.google-analytics.com/ga.js"></sc'+'ript>')</script>`+`<script type="text/javascript">`+`try {`+`var gwoTracker=_gat._getTracker("UA-225715-15");`+`gwoTracker._trackPageview("/2687020024/test");`+`}catch(err){}</script>`+`<!-- End of Google Website Optimizer Tracking Script -->`++`</body>`++`</html>`+

Change 1 of 1 Show Entire File 01.html Stacked
	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950	@@ -0,0 +1,950 @@ +`<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">`+`<html xmlns="http://www.w3.org/1999/xhtml">`+`<head>`+`<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />`+`<title>HgInit: Ground Up Mercurial</title>`++`<script src="c/jquery-1.4.1.js"></script>`+`<script src="c/basic.js"></script>`++`<link href="c/styles.css" rel="stylesheet" type="text/css" />`+`<script type="text/javascript">`+`var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");`+`document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));`+`</script>`+`<script type="text/javascript">`+`try {`+`var pageTracker = _gat._getTracker("UA-225715-20");`+`pageTracker._setDomainName("none");`+`pageTracker._setAllowLinker(true);`+`pageTracker._trackPageview();`+`} catch(err) {}</script>`++`<!-- Google Website Optimizer Control Script -->`+`<script>`+`function utmx_section(){}function utmx(){}`+`(function(){var k='2687020024',d=document,l=d.location,c=d.cookie;function f(n){`+`if(c){var i=c.indexOf(n+'=');if(i>-1){var j=c.indexOf(';',i);return c.substring(i+n.`+`length+1,j<0?c.length:j)}}}var x=f('__utmx'),xx=f('__utmxx'),h=l.hash;`+`d.write('<sc'+'ript src="'+`+`'http'+(l.protocol=='https:'?'s://ssl':'://www')+'.google-analytics.com'`+`+'/siteopt.js?v=1&utmxkey='+k+'&utmx='+(x?x:'')+'&utmxx='+(xx?xx:'')+'&utmxtime='`+`+new Date().valueOf()+(h?'&utmxhash='+escape(h.substr(1)):'')+`+`'" type="text/javascript" charset="utf-8"></sc'+'ript>')})();`+`</script><script>utmx("url",'A/B');</script>`+`<!-- End of Google Website Optimizer Control Script -->`+`</head>`+`<body>`+`<div id="kilnFlyOut">`+`<div class="flyouttext">`+`<strong>Kiln gives you:</strong><br />`++`• A complete version control system`+`based on <a href="http://mercurial.selenic.com/" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/mercurial.selenic.com');">Mercurial</a><br />`+`• <a href="http://fogcreek.com/kiln/learnmore.html#hist_BranchAndMerge" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/branchandmerge.kilnhg.com');">Branching and merging</a> that really works`+`</div>`++`<div class="flyouttext">`+`• <a href="http://fogcreek.com/kiln/learnmore.html#hist_Tools" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/tools.kilnhg.com');">Straightforward setup</a> on your server, or simple secure hosting on ours<br />`+`• Seamlessly integrated <a href="http://fogcreek.com/kiln/learnmore.html#hist_StartReviewsEffortlessly" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/startreviews.kilnhg.com');">code review</a>`+`</div>`+`<div class="flyouttext"> <a href="convert.html" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/freetrial.shop.fogcreek.com');"><img src="i/getstarted.gif" width="182" height="24" border="0" /></a>`+`</div>`+`<div class="flyoutteaser"><nobr><strong>Try Kiln free!</strong> Mercurial hosting and more.</nobr></div>`+`</div>`+++`<div class="toptop" align="left">`+`<ul>`+`<li align="center"><a href="http://www.joelonsoftware.com/" onClick="javascript: pageTracker._trackPageview('/outbound/toptop/joelonsoftware.com');">Joel on Software</a></li>`+`<li align="center"><a href="http://mercurial.selenic.com/" onClick="javascript: pageTracker._trackPageview('/outbound/toptop/mercurial.selenic.com');">Mercurial</a></li>`+`<li align="center"><a href="index.html">Home</a></li>`+`</ul>`+`</div>`+`<div id="dropshadow"></div>`+`<div id="topnav">`+`<div class="tInterior">`++`<a href="index.html">`+`<img src="i/logo.png" border="0" alt="HgInit Home" />`+`</a>`++`Even if you’re working by yourself,`+`you should use Mercurial to get the`+`benefits of version control. This tutorial shows`+`how easy it is to check a directory into Mercurial`+`so you can track old versions easily.`+`</div>`+`</div>`+++`<div class="main">`++`<h1>Ground up Mercurial</h1>`++`<div class="content">`+`<p>`+`Mercurial is a <em>version control system</em>. Developers use it to manage source code.`+`It serves two important purposes:`+`</p>`++`<ol>`+`<li>It keeps track of every old version of every file</li>`+`<li>It can merge different versions of your code, so that teammates can work independently on the code and then merge their changes</li>`+`</ol>`++`<p>Without Mercurial, you could try to keep old versions`+`just by making a lot of copies of the directory containing all your code:</p>`++`<div class="i">`+`<img src="i/01-copies.png">`+`</div>`++`<p>This is tedious, takes up a lot of disk space, and confusing. Using version control is a better way to do this.</p>`++`<p>Most people work with Mercurial through the command line, which works on Windows, Unix, and Mac. The command for Mercurial is <strong>hg</strong>:`+`</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit> <strong>hg</strong>`+`Mercurial Distributed SCM`++`basic commands:`++`add add the specified files on the next commit`+`annotate show changeset information by line for each file`+`clone make a copy of an existing repository`+`commit commit the specified files or all outstanding changes`+`diff diff repository (or selected files)`+`export dump the header and diffs for one or more changesets`+`forget forget the specified files on the next commit`+`init create a new repository in the given directory`+`log show revision history of entire repository or files`+`merge merge working directory with another revision`+`pull pull changes from the specified source`+`push push changes to the specified destination`+`remove remove the specified files on the next commit`+`serve export the repository via HTTP`+`status show changed files in the working directory`+`summary summarize working directory state`+`update update working directory`++`use "hg help" for the full list of commands or "hg -v" for details`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>Typing <strong>hg</strong> without anything else gives you a list of the most common commands that are available. You can also try <strong>hg help</strong> for a complete list of commands.</p>`++`<p>To take advantage of version control, you needed a <em>repository</em>. A repository stores all your old versions of every file. To save disk space, it’s not actually going to store every old version—it’s just going to store a compact list of changes.</p>`++`<p>In the old days, getting a repository was a big deal. You had to have a central server somewhere and you had to install software on it. Mercurial is <em>distributed</em>, so you can use it without a fancy central server. You can run it entirely on your own computer. And getting a repository is super-easy: you just go into the top-level directory where all your code lives…</p>`+++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit> <strong>cd CountDown</strong>`++`c:\hginit\CountDown> <strong>dir /w</strong>`+`Volume in drive C has no label.`+`Volume Serial Number is 9862-36C5`++`Directory of c:\hginit\CountDown`++`[.] [..] a.txt`+`AlternateMessages.xml App.config App.xaml`+`App.xaml.cs CountDown.xaml CountDown.xaml.cs`+`DevDaysCountDown.csproj favicon.ico [Images]`+`[Properties] [TweetSharp]`+`9 File(s) 155,932 bytes`+`5 Dir(s) 76,083,609,600 bytes free`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<div class="cheat">`++`</div>`++`<p>… there’s my code, and you type <strong>hg init</strong>:</p>`+++`<div class="cheatcontent" style="margin-top:-50px">`+`<div class="cheattop">`+`<div class="command">hg init</div>`+`</div>`+`<p class="cheattext">creates a repository</p>`+`<img src="i/cheatbot.png" width="241" height="41" />`+`</div>`++++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre class="cl">`+`c:\hginit\CountDown> <strong>hg init</strong>`++`c:\hginit\CountDown>`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`+`<p>Wait a minute, did anything happen? It doesn’t look like anything happened. But if you look closely, you’ll see that there’s a new directory there, named <strong>.hg</strong>:</p>`+`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre class="cl">`+`c:\hginit\CountDown> <strong>dir /w</strong>`+`Volume in drive C has no label.`+`Volume Serial Number is 9862-36C5`++`Directory of c:\hginit\CountDown`++`[.] [..] [.hg]`+`a.txt AlternateMessages.xml App.config`+`App.xaml App.xaml.cs CountDown.xaml`+`CountDown.xaml.cs DevDaysCountDown.csproj favicon.ico`+`[Images] [Properties] [TweetSharp]`+`9 File(s) 155,932 bytes`+`6 Dir(s) 76,083,650,560 bytes free`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>That’s the repository! It’s a directory full of everything Mercurial needs. Settings, old version of files, tags, an extra pair of socks for when it rains, etc. <em>Don’t go in there.</em> You are almost never going to want to mess with that directory directly.</p>`+++`<p>OK, now that we have a fresh new repository, we’re going to want to add all these source files to it. That’s easy, too: just type <strong>hg add</strong>.</p>`++`<div class="cheatcontent" style="margin-top:-60px">`+`<div class="cheattop">`+`<div class="command">hg add</div>`+`</div>`+`<p class="cheattext">schedules files to be added to the repository. They won’t actually be added until you commit </p>`+`<img src="i/cheatbot.png" width="241" height="41" />`+`</div>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg add</strong>`+`adding AlternateMessages.xml`+`adding App.config`+`adding App.xaml`+`adding App.xaml.cs`+`adding CountDown.xaml`+`adding CountDown.xaml.cs`+`adding DevDaysCountDown.csproj`+`adding Images\background_city.jpg`+`adding Images\carsonified_presents.png`+`adding Images\darkpanel.png`+`adding Images\devdays.png`+`adding Images\failwhale.png`+`adding Images\holding_image.jpg`+`adding Images\jeff_atwood.jpg`+`adding Images\joel_spolsky.jpg`+`adding Images\logo_stackoverflow.png`+`adding Images\matt_lacey.jpg`+`adding Images\sideDarkpanel.png`+`adding Images\vertical_lines2.png`+`adding Properties\AssemblyInfo.cs`+`adding Properties\Resources.Designer.cs`+`adding Properties\Resources.resx`+`adding Properties\Settings.Designer.cs`+`adding Properties\Settings.settings`+`adding TweetSharp\Dimebrain.TweetSharp.dll`+`adding TweetSharp\Dimebrain.TweetSharp.xml`+`adding TweetSharp\Newtonsoft.Json.dll`+`adding a.txt`+`adding favicon.ico`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>There’s still one more step… you have to <em>commit</em> your changes. What changes? The change of adding all those files.</p>`++`<p>Why do you have to commit? With Mercurial, committing says “hey, the way the files look right now—please remember that.” It’s like making a copy of the whole directory… every time you have something that you’ve changed that you sorta like, you commit.</p>`++`<!-- hg commit box -->`+`<div class="cheatcontent" style="margin-top:-80px">`+`<div class="cheattop">`+`<div class="command">hg commit</div>`+`</div>`+`<p class="cheattext">saves the current state of all files to the repository </p>`+`<img src="i/cheatbot.png" width="241" height="41" />`+`</div>`+++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg commit</strong>`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>Mercurial will pop up an editor so that you can type a commit message. This is just something you type to remind yourself of what changed in this commit.</p>`+++`<img src="i/01-commit0.png">`++`<p>When you save and exit, your files will be committed.</p>`++++`<p>You can type <strong>hg log</strong> to see a history of changes. It’s like your repository’s blog:</p>`++`<!-- hg log box -->`+`<div class="cheatcontent" style="margin-top:-50px">`+`<div class="cheattop">`+`<div class="command">hg log</div>`+`</div>`+`<p class="cheattext">shows the history of changes committed to the repository </p>`+`<img src="i/cheatbot.png" width="241" height="41" />`+`</div>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg log</strong>`+`changeset: 0:da5f372c3901`+`tag: tip`+`user: Joel Spolsky <joel@joelonsoftware.com>`+`date: Fri Feb 05 13:04:30 2010 -0500`+`summary: Initial version of the CountDown code</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>Let’s edit a file and see what happens.</p>`++`<!-- edit text file module -->`+`<div class="edit1">`+`<div class="edittopbefore">`+`a.txt </div>`+`<div class="editcontent">`+`Scott Adams: Normal people believe that if it ain't`+`broke, don't fix it. Engineers believe that if it`+`ain't broke, it doesn't have enough features yet.`+`</div>`+`<img src="i/edit-bot.gif" width="387" height="76" />`+`</div>`+++`<div class="edit2">`+`<img src="i/arrow2.gif" width="83" height="97" class="editArrow" />`+`<div class="edittopafter">`+`a.txt`+`</div>`+`<div class="editcontent">`+`<strong>SCOTT ADAMS:</strong>`+`Normal people believe that if it ain't`+`broke, don't fix it. Engineers believe that if it`+`ain't broke, it doesn't have enough features yet.`+`</div>`+`<img src="i/edit-bot.gif" width="387" height="76" />`+`</div>`++`<div style="clear: both;"> </div>`+`<!-- end edit text file module -->`+++`<p>Now that we’ve made another change, we can commit it using <strong>hg commit</strong>:</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg commit</strong>`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>Notice that Mercurial has figured out that only one file, a.txt, changed:</p>`+++`<img src="i/01-commit1.png">`+++`<p>And now that I’ve committed, let’s take a look at the log:</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg log</strong>`+`changeset: 1:a9497f468dc3`+`tag: tip`+`user: Joel Spolsky <joel@joelonsoftware.com>`+`date: Fri Feb 05 13:26:13 2010 -0500`+`summary: Capitalized "Scott Adams"`++`changeset: 0:da5f372c3901`+`user: Joel Spolsky <joel@joelonsoftware.com>`+`date: Fri Feb 05 13:04:30 2010 -0500`+`summary: Initial version of the CountDown code`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`+++`<p>Like any modern blogger, Mercurial puts the newest stuff on top.</p>`++`<p>I’m going to make one more change, just to amuse myself.</p>`+++`<div class="edit1">`+`<div class="edittopbefore">`+`a.txt </div>`+`<div class="editcontent">`+`SCOTT ADAMS: Normal people believe that if it ain't`+`broke, don't fix it. Engineers believe that if it`+`ain't broke, it doesn't have enough features yet.`+`</div>`+`<img src="i/edit-bot.gif" width="387" height="76" />`+`</div>`+++`<div class="edit2">`+`<img src="i/arrow2.gif" width="83" height="97" class="editArrow" />`+`<div class="edittopafter">a.txt</div>`+`<div class="editcontent">`+`SCOTT ADAMS:`+`Normal people believe that if it <strong>isn't`+`broken</strong>, don't fix it. Engineers believe that if it`+`<strong>isn't broken</strong>, it doesn't have enough features yet.`+`</div>`+`<img src="i/edit-bot.gif" width="387" height="76" />`+`</div>`++`<div style="clear: both;"> </div>`+++`<p>Committing:</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg commit</strong>`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>My commit message:</p>`+++`<img src="i/01-commit2.png">`+++`<p>And now what does the log show?</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg log</strong>`+`changeset: 2:55490459b740`+`tag: tip`+`user: Joel Spolsky <joel@joelonsoftware.com>`+`date: Fri Feb 05 13:47:43 2010 -0500`+`summary: Fixed some grammar`++`changeset: 1:a9497f468dc3`+`user: Joel Spolsky <joel@joelonsoftware.com>`+`date: Fri Feb 05 13:26:13 2010 -0500`+`summary: Capitalized "Scott Adams"`++`changeset: 0:da5f372c3901`+`user: Joel Spolsky <joel@joelonsoftware.com>`+`date: Fri Feb 05 13:04:30 2010 -0500`+`summary: Initial version of the CountDown code`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>OK, that was a lot of fun. I made some changes, and each time`+`I made a significant change, I committed it to the repository.</p>`++`<p>I know what you’re thinking. You’re thinking, “JOEL, THIS ALL SEEMS LIKE A BIG WASTE OF TIME.”`+`Why go through all this rigamarole of committing?`+`</p>`++`<p>Patience, young grasshopper. You’re about to learn how to get some benefit out of this.</p>`++`<p>Number one. Let’s say you make a huge mistake editing.</p>`+++`<!-- edit text file module -->`+`<div class="edit1">`+`<div class="edittopbefore">`+`a.txt </div>`+`<div class="editcontent">`+`SCOTT ADAMS: Normal people believe that if it isn't`+`broken, don't fix it. Engineers believe that if it`+`isn't broken, it doesn't have enough features yet.`+`</div>`+`<img src="i/edit-bot.gif" width="387" height="76" />`+`</div>`+++`<div class="edit2">`+`<img src="i/arrow2.gif" width="83" height="97" class="editArrow" />`+`<div class="edittopafter">a.txt</div>`+`<div class="editcontent">`+`<strong>DAN QUAYLE: Illegitimacy is something we should`+`talk about in terms of not having it.</strong>`+`</div>`+`<img src="i/edit-bot.gif" width="387" height="76" />`+`</div>`++`<div style="clear: both;"> </div>`+`<!-- end edit text file module -->`+++`<p>And then, gosh, just for good measure you delete a couple of`+`really important files.</p>`+++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>del favicon.ico</strong>`++`c:\hginit\CountDown> <strong>del App.xaml</strong>`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>In the days before Mercurial, this would be a good opportunity to go crying`+`to the system administrator and asking piercingly sad questions about`+`<em>why</em> the backup system is “temporarily” out of commission and has been`+`for the last eight months.</p>`++`<p>The system administrator, whom everybody calls Taco, is too shy to eat lunch`+`with the rest of the team. On those rare occasions where he is away from his swivel office`+`chair, you will notice a triangular-shaped salsa-colored stain on the seat where`+`drippings of his many Mexican lunches fell between his legs, insuring that nobody takes`+`his chair, even though it is the superior Herman Miller variety that the company founders bought`+`themselves, not the standard-issue Staples $99 special that causes everyone else`+`back pain.</p>`++`<p>Anyway, yeah, there’s no backup.</p>`+++`<p>Thanks to Mercurial, though, when you’re unhappy with your changes, you can just issue`+`the handy command <strong>hg revert</strong> which will immediately revert`+`your directory back to the way it was at the time of the last commit.</p>`++`<!-- hg log box -->`+`<div class="cheatcontent" style="margin-top:-80px">`+`<div class="cheattop">`+`<div class="command">hg revert</div>`+`</div>`+`<p class="cheattext">revert changed files back to committed version </p>`+`<img src="i/cheatbot.png" width="241" height="41" />`+`</div>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg revert --all</strong>`+`reverting App.xaml`+`reverting a.txt`+`reverting favicon.ico`++`c:\hginit\CountDown> <strong>type a.txt</strong>`+`SCOTT ADAMS: Normal people believe that if it isn't`+`broken, don't fix it. Engineers believe that if it`+`isn't broken, it doesn't have enough features yet.`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>I used the command line argument <strong><code>--</code>all</strong> because I wanted`+`to revert <em>all</em> files back to their original state.</p>`++`<p>So, when you’re working on source code with Mercurial:</p>`++`<ol>`+`<li>Make some changes</li>`+`<li>See if they work</li>`+`<li>If they do, <strong>commit</strong> them</li>`+`<li>If they don’t, <strong>revert</strong> them</li>`+`<li>GOTO 1</li>`+`</ol>`++`<p>(I know. Between the Windows command prompt and the GOTO statements, I am the <em>least cool programmer</em> who ever lived.)</p>`++`<!-- hg log box -->`+`<div class="cheatcontent" style="margin-top:-10px">`+`<div class="cheattop">`+`<div class="command">hg status</div>`+`</div>`+`<p class="cheattext">shows a list of changed files</p>`+`<img src="i/cheatbot.png" width="241" height="41" />`+`</div>`++`<p>As time goes on, you may get confused about where you are and what`+`changes you’ve made since the last commit. Mercurial keeps`+`track of all that for you. All you have to do is type <strong>hg status</strong> and`+`Mercurial will give you a list of files that have changed.</p>`++`<p>Suppose I create a file, edit a file, and delete a file.</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>copy a.txt b.txt</strong>`+`1 file(s) copied.`++`c:\hginit\CountDown> <strong>notepad2 a.txt</strong>`++`c:\hginit\CountDown> <strong>del favicon.ico</strong>`++`c:\hginit\CountDown> <strong>hg status</strong>`+`M a.txt`+`! favicon.ico`+`? b.txt`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p><strong>hg status</strong> lists any files that have changed with a little letter at`+`the beginning of the line telling you what’s up. “M” means “Modified”—the file has been changed. “!” means missing—the file is supposed to be there, but it disappeared.`+`“?” means unknown—Mercurial doesn’t know anything about this file. Yet.</p>`++`<p>Let’s deal with these changes one at a time. That modified file, <strong>a.txt</strong>.`+`What’s modified about it? You may have forgotten what you changed! Heck, I can`+`barely even remember what I ate for breakfast most days. Which is especially worrisome`+`because it’s ALWAYS CHEERIOS. Anyway, a.txt has changed. What changed?</p>`+++`<p>There’s a command for that: <strong>hg diff</strong> tells you exactly what’s changed`+`with a file since the last commit.</p>`+++`<div class="cheatcontent" style="margin-top:-50px">`+`<div class="cheattop">`+`<div class="command">hg diff</div>`+`</div>`+`<p class="cheattext">shows what changed in a file </p>`+`<img src="i/cheatbot.png" width="241" height="41" />`+`</div>`+++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>c:\hginit\CountDown> <strong>hg diff a.txt</strong>`+`diff -r 55490459b740 a.txt`+`--- a/a.txt Fri Feb 05 13:47:43 2010 -0500`+`+++ b/a.txt Fri Feb 05 14:31:18 2010 -0500`+`@@ -1,3 +1,3 @@`+`-SCOTT ADAMS: Normal people believe that if it isn't`+`+SCOTT ADAMS: Civilians believe that if it isn't`+`broken, don't fix it. Engineers believe that if it`+`isn't broken, it doesn't have enough features yet.`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>This format is a little bit cryptic, but the interesting part`+`is that you can see some lines that begin with a minus,`+`which were removed, and lines that begin with a plus, which`+`were added, so you can see here that “Normal people” was edited to be “Civilians”.`+`</p>`++`<!-- hg log box -->`+`<div class="cheatcontent" style="margin-top:-10px;">`+`<div class="cheattop">`+`<div class="command">hg remove</div>`+`</div>`+`<p class="cheattext">schedules files to be removed from`+`the repository. They won’t actually`+`be removed until you commit. </p>`+`<img src="i/cheatbot.png" width="241" height="41" />`+`</div>`++`<p>`+`Now. That missing file, favicon.ico. As earlier, if you didn’t mean to`+`delete it, you can <strong>hg revert</strong>, but let’s assume you really did mean`+`to remove it. Whenever you remove (or add) a file, you have to tell Mercurial:`+`</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg remove favicon.ico</strong>`++`c:\hginit\CountDown> <strong>hg status</strong>`+`M a.txt`+`R favicon.ico`+`? b.txt`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>The “R” means “Removed” so the next time we commit in Mercurial this file will be`+`removed. (The <em>history</em> of the file will remain in the repository, so of course`+`we can always get it back). Finally, we need to add that new file, <strong>b.txt</strong>:</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg add</strong>`+`adding b.txt`++`c:\hginit\CountDown> <strong>hg st</strong>`+`M a.txt`+`A b.txt`+`R favicon.ico`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>“A” means “Added.” Did you notice I was getting lazy about typing out`+`<strong>hg status</strong> all the time? Mercurial only needs enough letters`+`to disambiguate, and there are no other commands that start with <strong>st</strong>.</p>`++`<p>Having solved all the little ?’s and !’s, I can go ahead and check in my changes:</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg commit</strong>`++`c:\hginit\CountDown> <strong>hg log</strong>`+`changeset: 3:2f4718ee168e`+`tag: tip`+`user: Joel Spolsky <joel@joelonsoftware.com>`+`date: Fri Feb 05 14:54:45 2010 -0500`+`summary: A few highly meaningful changes. No favicon.ico no more.`++`changeset: 2:55490459b740`+`user: Joel Spolsky <joel@joelonsoftware.com>`+`date: Fri Feb 05 13:47:43 2010 -0500`+`summary: Fixed some grammar`++`changeset: 1:a9497f468dc3`+`user: Joel Spolsky <joel@joelonsoftware.com>`+`date: Fri Feb 05 13:26:13 2010 -0500`+`summary: Capitalized "Scott Adams"`++`changeset: 0:da5f372c3901`+`user: Joel Spolsky <joel@joelonsoftware.com>`+`date: Fri Feb 05 13:04:30 2010 -0500`+`summary: Initial version of the CountDown code</pre>`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>One more thing about the output from`+`<strong>hg log</strong>: the <em>changeset</em> line shows us a number`+`to every commit…. actually two numbers: a handy, short one, like “0” for`+`your initial revision, etc., and a long, goofy hexadecimal one which you can`+`ignore for now.</p>`++`<p>Remember that Mercurial keeps, in the repository, enough information`+`to reconstruct any old version of any file.</p>`++`<!-- hg log box -->`+`<div class="cheatcontent" style="margin-top:-10px">`+`<div class="cheattop">`+`<div class="command">hg cat</div>`+`</div>`+`<p class="cheattext">shows any revision of any file.</p>`+`<img src="i/cheatbot.png" width="241" height="41" />`+`</div>`++`<p>First of all, the simple command <strong>hg cat</strong> can be used to print any old version`+`of a file. For example, to see what a.txt looks like now:</p>`+++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg cat a.txt</strong>`+`SCOTT ADAMS: Civilians believe that if it isn't`+`broken, don't fix it. Engineers believe that if it`+`isn't broken, it doesn't have enough features yet.`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>To see what it looked like in the past, I can just pick a changeset number`+`from the log. Then I use the <strong>cat</strong> command`+`with the <strong>-r</strong> (“revision”) argument:</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg cat -r 0 a.txt</strong>`+`Scott Adams: Normal people believe that if it ain't`+`broke, don't fix it. Engineers believe that if it`+`ain't broke, it doesn't have enough features yet.`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>If the file is long and complicated, and only a little bit of it changed,`+`I can use the <strong>hg diff</strong> command with an <strong>-r</strong>`+`argument to print the difference between any two revisions. For example, to see`+`what changed between revisions 0 and 1:</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg diff -r 0:1 a.txt</strong>`+`diff -r da5f372c3901 -r a9497f468dc3 a.txt`+`--- a/a.txt Fri Feb 05 13:04:30 2010 -0500`+`+++ b/a.txt Fri Feb 05 13:26:13 2010 -0500`+`@@ -1,3 +1,3 @@`+`-Scott Adams: Normal people believe that if it ain't`+`+SCOTT ADAMS: Normal people believe that if it ain't`+`broke, don't fix it. Engineers believe that if it`+`ain't broke, it doesn't have enough features yet.`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p>Finally, if you haven’t collapsed yet from exhaustion, before`+`I finish this tutorial, I just want to show you <em>one more tiny thing:</em> you can use`+`the <strong>hg update</strong> command to go backwards or forwards in time`+`to any revision you want. Well, you can’t really go into the`+`future <em>per se</em>, although that would be super-cool. If you only had four revisions`+`you would just <strong>hg update -r 103994</strong> and get some really`+`cool anti-gravity sci-fi futuristic version of your source code.`+`But of course, that is not possible.</p>`++`<!-- hg log box -->`+`<div class="cheatcontent" style="margin-top:-120px">`+`<div class="cheattop">`+`<div class="command">hg update</div>`+`</div>`+`<p class="cheattext">update the working directory to a particular revision </p>`+`<img src="i/cheatbot.png" width="241" height="41" />`+`</div>`++`<p>What is possible is going <em>back</em> to any version. Watch:</p>`++`<div class="codesnippet">`+`<div class="codetop"> </div>`+`<pre>`+`c:\hginit\CountDown> <strong>hg update -r 0</strong>`+`2 files updated, 0 files merged, 1 files removed, 0 files unresolved`++`c:\hginit\CountDown> <strong>type a.txt</strong>`+`Scott Adams: Normal people believe that if it ain't`+`broke, don't fix it. Engineers believe that if it`+`ain't broke, it doesn't have enough features yet.`++`c:\hginit\CountDown> <strong>hg up -r 1</strong>`+`1 files updated, 0 files merged, 0 files removed, 0 files unresolved`++`c:\hginit\CountDown> <strong>type a.txt</strong>`+`SCOTT ADAMS: Normal people believe that if it ain't`+`broke, don't fix it. Engineers believe that if it`+`ain't broke, it doesn't have enough features yet.`++`c:\hginit\CountDown> <strong>hg up</strong>`+`2 files updated, 0 files merged, 1 files removed, 0 files unresolved`++`c:\hginit\CountDown> <strong>type a.txt</strong>`+`SCOTT ADAMS: Civilians believe that if it isn't`+`broken, don't fix it. Engineers believe that if it`+`isn't broken, it doesn't have enough features yet.`+`</pre>`+`<div class="codebottom"> </div>`+`</div>`++`<p><strong>hg update</strong> is actually modifying every file in the directory that changed`+`to go backwards and forwards through time. If a file was added or removed, it adds or removes it.`+`Without any arguments, <strong>hg update</strong> goes to the latest version.</p>`++`<h2>Test yourself</h2>`++`<p>OK! That’s it for tutorial one. Here’s all the things you should know how to do now:</p>`++`<ol>`+`<li>Create a repository</li>`+`<li>Add and remove files in a repository</li>`+`<li>After making changes, see what uncommitted changes you made, then</li>`+`<li>… commit if you like them,</li>`+`<li>… or revert if you don’t.</li>`+`<li>See old versions of files, or even move your directory backwards and forwards in time</li>`+`</ol>`+++`<div class="footer">`+`<div class="footernav" id="home" align="center"><a href="index.html"><span class="angleQuote">«</span> Home</a></div>`+`<div class="footernav" id="comingup">`+`Next, we’ll see how to get your whole team working with Mercurial.</div>`+`<div class="footernav" id="next" align="center"><a href="02.html">Next <span class="angleQuote">»</span></a></div>`+++`</div>`++`<div class="pagebottom">`++`<div class="bottomimg">`+`<a href="http://www.kilnhg.com" target="_blank" id="logoLink" title="KilnHg.com" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/klinhg.com');"> </a>`+`<div class="bottomtext">This tutorial was brought to you by the fine folks at Fog Creek Software, makers of Kiln, a version control system powered by Mercurial</div>`++`<div class="bottomtext"><strong>Kiln gives you:</strong><br />`++`• A complete version control system based on <a href="http://mercurial.selenic.com/" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/mercurial.selenic.com');">Mercurial</a><br />`+`• <a href="http://fogcreek.com/kiln/learnmore.html#hist_BranchAndMerge" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/branchandmerge.kilnhg.com');">Branching and merging</a> that really works<br />`+`• <a href="http://fogcreek.com/kiln/learnmore.html#hist_Tools" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/tools.kilnhg.com');">Straightforward setup</a> on your server, or simple secure hosting on ours<br />`+`• Seamlessly integrated <a href="http://fogcreek.com/kiln/learnmore.html#hist_StartReviewsEffortlessly" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/startreviews.kilnhg.com');">code review</a><br />`+`</div>`++`<div class="bottomtext getStarted">`+`<a href="convert.html" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/freetrial.shop.fogcreek.com');"><img src="i/getstarted.gif" width="182" height="24" border="0" /></a>`+`</div>`++`</div>`+`<div class="about">`++`<p>`+`<strong>Any questions?</strong>`+`</p>`++`<p>`+`If you have any questions about the material in this tutorial,`+`no matter how newbie, ask them at <a href="http://kiln.stackexchange.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/kiln.stackexchange.com');">the`+`Kiln Knowledge Exchange.</a>`+`</p>`++`<p>`+`<strong>About the author.</strong>`+`</p>`++`<p>`+Joel Spolsky is the founder of <a href="http://fogcreek.com" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/fogcreek.com');">Fog Creek Software</a>, a New York company that proves that you can treat programmers well and still be profitable. Programmers get private offices, free lunch, and work 40 hours a week. Customers only pay for software if they’re delighted. Fog Creek makes <a href="http://www.fogbugz.com" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/fogbugz.com');">FogBugz</a>, <a href="http://www.kilnhg.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/text.kilnhg.com');">Kiln</a>, and <a href="https://www.copilot.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/copilot.com');">Fog Creek Copilot</a>. Joel's blog <a href="http://www.joelonsoftware.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/joelonsoftware.com');">Joel on Software</a> is read by programmers everywhere.++`</p>`++`</div>`+++`<!-- close bottom div -->`+`</div>`+`<!-- close "content" column -->`+`</div>`+`<!-- close "main" div -->`+`</div>`+`<!-- bottom grey bar -->`+`<div class="botbot" align="left">`+`</div>`++`<!-- Google Website Optimizer Tracking Script -->`+`<script type="text/javascript">`+`if(typeof(_gat)!='object')document.write('<sc'+'ript src="http'+`+`(document.location.protocol=='https:'?'s://ssl':'://www')+`+`'.google-analytics.com/ga.js"></sc'+'ript>')</script>`+`<script type="text/javascript">`+`try {`+`var gwoTracker=_gat._getTracker("UA-225715-15");`+`gwoTracker._trackPageview("/2687020024/test");`+`}catch(err){}</script>`+`<!-- End of Google Website Optimizer Tracking Script -->`++`</body>`++`</html>`

Show Entire File 02.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File 03.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File 04.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File 05.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

arrow.png

Change 1 of 1 Show Entire File artsrc/00-hg.bmml Stacked
	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258	@@ -0,0 +1,258 @@ +`<mockup version="1.0" skin="sketch" measuredW="929" measuredH="680" mockupW="622" mockupH="653">`+`<controls>`+`<control controlID="0" controlTypeID="com.balsamiq.mockups::FieldSet" x="433" y="17" w="267" h="160" measuredW="200" measuredH="170" zOrder="0" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>Central%20Repository</text>`+`</controlProperties>`+`</control>`+`<control controlID="1" controlTypeID="com.balsamiq.mockups::FieldSet" x="302" y="511" w="162" h="155" measuredW="200" measuredH="170" zOrder="1" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>Joel%27s%20Working%20Directory</text>`+`</controlProperties>`+`</control>`+`<control controlID="2" controlTypeID="com.balsamiq.mockups::FieldSet" x="475" y="512" w="171" h="155" measuredW="200" measuredH="170" zOrder="2" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>Rose%27s%20Working%20Directory</text>`+`</controlProperties>`+`</control>`+`<control controlID="3" controlTypeID="com.balsamiq.mockups::FieldSet" x="658" y="515" w="160" h="155" measuredW="200" measuredH="170" zOrder="3" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>Bob%27s%20Working%20Directory</text>`+`</controlProperties>`+`</control>`+`<control controlID="4" controlTypeID="com.balsamiq.mockups::Icon" x="317" y="552" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="4" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="5" controlTypeID="com.balsamiq.mockups::Icon" x="317" y="572" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="5" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="6" controlTypeID="com.balsamiq.mockups::Icon" x="317" y="593" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="6" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="7" controlTypeID="com.balsamiq.mockups::Icon" x="317" y="613" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="7" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="8" controlTypeID="com.balsamiq.mockups::Icon" x="317" y="633" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="8" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="9" controlTypeID="com.balsamiq.mockups::Icon" x="385" y="576" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="9" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FileIcon%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="10" controlTypeID="com.balsamiq.mockups::Icon" x="372" y="614" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="10" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FileIcon%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="11" controlTypeID="com.balsamiq.mockups::Icon" x="407" y="586" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="11" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FileIcon%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="12" controlTypeID="com.balsamiq.mockups::Icon" x="492" y="558" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="12" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="13" controlTypeID="com.balsamiq.mockups::Icon" x="492" y="578" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="13" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="14" controlTypeID="com.balsamiq.mockups::Icon" x="492" y="599" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="14" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="15" controlTypeID="com.balsamiq.mockups::Icon" x="492" y="619" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="15" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="16" controlTypeID="com.balsamiq.mockups::Icon" x="492" y="639" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="16" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="17" controlTypeID="com.balsamiq.mockups::Icon" x="560" y="582" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="17" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FileIcon%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="18" controlTypeID="com.balsamiq.mockups::Icon" x="551" y="620" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="18" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FileIcon%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="19" controlTypeID="com.balsamiq.mockups::Icon" x="586" y="592" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="19" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FileIcon%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="20" controlTypeID="com.balsamiq.mockups::Icon" x="683" y="561" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="20" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="21" controlTypeID="com.balsamiq.mockups::Icon" x="683" y="581" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="21" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="22" controlTypeID="com.balsamiq.mockups::Icon" x="683" y="602" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="22" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="23" controlTypeID="com.balsamiq.mockups::Icon" x="683" y="622" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="23" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="24" controlTypeID="com.balsamiq.mockups::Icon" x="683" y="642" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="24" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FolderClosed%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="25" controlTypeID="com.balsamiq.mockups::Icon" x="751" y="585" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="25" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FileIcon%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="26" controlTypeID="com.balsamiq.mockups::Icon" x="742" y="623" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="26" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FileIcon%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="27" controlTypeID="com.balsamiq.mockups::Icon" x="777" y="595" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="27" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FileIcon%7Cxsmall</icon>`+`</controlProperties>`+`</control>`+`<control controlID="28" controlTypeID="com.balsamiq.mockups::ScratchOut" x="447" y="46" w="238" h="116" measuredW="205" measuredH="107" zOrder="28" locked="false" isInGroup="-1">`+`<controlProperties>`+`<color>11776947</color>`+`</controlProperties>`+`</control>`+`<control controlID="29" controlTypeID="com.balsamiq.mockups::Arrow" x="357" y="191" w="111" h="100" measuredW="150" measuredH="100" zOrder="29" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text/>`+`<curvature>0</curvature>`+`<direction>bottom</direction>`+`</controlProperties>`+`</control>`+`<control controlID="30" controlTypeID="com.balsamiq.mockups::Icon" x="423" y="619" w="-1" h="-1" measuredW="16" measuredH="16" zOrder="30" locked="false" isInGroup="-1">`+`<controlProperties>`+`<icon>FileIcon%7Cxsmall</icon>`+`<color>16711680</color>`+`</controlProperties>`+`</control>`+`<control controlID="31" controlTypeID="com.balsamiq.mockups::RedX" x="547" y="621" w="23" h="14" measuredW="240" measuredH="104" zOrder="31" locked="false" isInGroup="-1"/>`+`<control controlID="32" controlTypeID="com.balsamiq.mockups::Arrow" x="660" y="191" w="67" h="100" measuredW="150" measuredH="100" zOrder="32" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text/>`+`<curvature>0</curvature>`+`<direction>top</direction>`+`</controlProperties>`+`</control>`+`<control controlID="33" controlTypeID="com.balsamiq.mockups::Arrow" x="555" y="191" w="10" h="100" measuredW="150" measuredH="100" zOrder="33" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text/>`+`<curvature>0</curvature>`+`<direction>bottom</direction>`+`</controlProperties>`+`</control>`+`<control controlID="35" controlTypeID="com.balsamiq.mockups::Label" x="302" y="266" w="-1" h="-1" measuredW="46" measuredH="25" zOrder="34" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>hg%20pull</text>`+`</controlProperties>`+`</control>`+`<control controlID="36" controlTypeID="com.balsamiq.mockups::Label" x="396" y="183" w="-1" h="-1" measuredW="51" measuredH="25" zOrder="35" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>hg%20push</text>`+`</controlProperties>`+`</control>`+`<control controlID="37" controlTypeID="com.balsamiq.mockups::VCurly" x="822" y="28" w="67" h="140" measuredW="180" measuredH="140" zOrder="36" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>server</text>`+`</controlProperties>`+`</control>`+`<control controlID="38" controlTypeID="com.balsamiq.mockups::VCurly" x="844" y="308" w="75" h="357" measuredW="180" measuredH="140" zOrder="37" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>desktop</text>`+`</controlProperties>`+`</control>`+`<control controlID="39" controlTypeID="com.balsamiq.mockups::FieldSet" x="297" y="306" w="167" h="111" measuredW="200" measuredH="170" zOrder="38" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>Joel%27s%20Repository</text>`+`</controlProperties>`+`</control>`+`<control controlID="40" controlTypeID="com.balsamiq.mockups::ScratchOut" x="311" y="335" w="136" h="67" measuredW="205" measuredH="107" zOrder="39" locked="false" isInGroup="-1">`+`<controlProperties>`+`<color>11776947</color>`+`</controlProperties>`+`</control>`+`<control controlID="41" controlTypeID="com.balsamiq.mockups::FieldSet" x="476" y="306" w="167" h="111" measuredW="200" measuredH="170" zOrder="40" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>Rose%27s%20Repository</text>`+`</controlProperties>`+`</control>`+`<control controlID="43" controlTypeID="com.balsamiq.mockups::FieldSet" x="658" y="306" w="167" h="111" measuredW="200" measuredH="170" zOrder="41" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>Bob%27s%20Repository</text>`+`</controlProperties>`+`</control>`+`<control controlID="45" controlTypeID="com.balsamiq.mockups::Arrow" x="374" y="427" w="11" h="76" measuredW="150" measuredH="100" zOrder="42" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text/>`+`<curvature>0</curvature>`+`<direction>bottom</direction>`+`</controlProperties>`+`</control>`+`<control controlID="46" controlTypeID="com.balsamiq.mockups::Arrow" x="548" y="427" w="11" h="76" measuredW="150" measuredH="100" zOrder="43" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text/>`+`<curvature>0</curvature>`+`<direction>bottom</direction>`+`</controlProperties>`+`</control>`+`<control controlID="47" controlTypeID="com.balsamiq.mockups::Arrow" x="730" y="429" w="11" h="76" measuredW="150" measuredH="100" zOrder="44" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text/>`+`<curvature>0</curvature>`+`<direction>bottom</direction>`+`</controlProperties>`+`</control>`+`<control controlID="48" controlTypeID="com.balsamiq.mockups::Label" x="317" y="423" w="-1" h="-1" measuredW="46" measuredH="25" zOrder="45" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>hg%20com</text>`+`</controlProperties>`+`</control>`+`<control controlID="49" controlTypeID="com.balsamiq.mockups::Label" x="317" y="480" w="-1" h="-1" measuredW="38" measuredH="25" zOrder="46" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>hg%20up</text>`+`</controlProperties>`+`</control>`+`<control controlID="50" controlTypeID="com.balsamiq.mockups::ScratchOut" x="492" y="334" w="136" h="67" measuredW="205" measuredH="107" zOrder="47" locked="false" isInGroup="-1">`+`<controlProperties>`+`<color>11776947</color>`+`</controlProperties>`+`</control>`+`<control controlID="51" controlTypeID="com.balsamiq.mockups::ScratchOut" x="670" y="341" w="136" h="67" measuredW="205" measuredH="107" zOrder="48" locked="false" isInGroup="-1">`+`<controlProperties>`+`<color>11776947</color>`+`</controlProperties>`+`</control>`+`</controls>`+`</mockup>`\ No newline at end of file

Show Entire File artsrc/00-svn.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/01-copies.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Change 1 of 1 Show Entire File artsrc/02-repo-2.bmml Stacked
	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36	@@ -0,0 +1,36 @@ +`<mockup version="1.0" skin="sketch" measuredW="758" measuredH="349" mockupW="471" mockupH="229">`+`<controls>`+`<control controlID="0" controlTypeID="com.balsamiq.mockups::FieldSet" x="277" y="228" w="190" h="111" measuredW="200" measuredH="170" zOrder="0" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>Central%20Repository</text>`+`<backgroundAlpha>0</backgroundAlpha>`+`</controlProperties>`+`</control>`+`<control controlID="5" controlTypeID="com.balsamiq.mockups::FieldSet" x="558" y="110" w="190" h="111" measuredW="200" measuredH="170" zOrder="1" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>Joel%27s%20Repository</text>`+`<backgroundAlpha>0</backgroundAlpha>`+`</controlProperties>`+`</control>`+`<control controlID="10" controlTypeID="com.balsamiq.mockups::Arrow" x="471" y="164" w="83" h="70" measuredW="150" measuredH="100" zOrder="2" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text/>`+`<direction>bottom</direction>`+`</controlProperties>`+`</control>`+`<control controlID="12" controlTypeID="com.balsamiq.mockups::Button" x="564" y="187" w="-1" h="-1" measuredW="177" measuredH="28" zOrder="3" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>0%3A%20Initial%20version%20of%20guacamole</text>`+`<size>11</size>`+`<bold>false</bold>`+`</controlProperties>`+`</control>`+`<control controlID="13" controlTypeID="com.balsamiq.mockups::Button" x="564" y="159" w="-1" h="-1" measuredW="166" measuredH="28" zOrder="4" locked="false" isInGroup="-1">`+`<controlProperties>`+`<text>1%3A%20Change%20crunch%20to%20smoosh</text>`+`<size>11</size>`+`<bold>false</bold>`+`</controlProperties>`+`</control>`+`</controls>`+`</mockup>`\ No newline at end of file

Show Entire File artsrc/02-repo-3.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/02-repo-4.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/02-repo-5.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/02-repo-6.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/02-repo-7.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/02-repo.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/03-repo-2.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/03-repo.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/04-repo-2.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/04-repo.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/05-complex.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/05-repo-2.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/05-repo-3.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/05-repo-4.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File artsrc/05-repo.bmml Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

artsrc/background.cpt
		(Binary files differ)

artsrc/backgroundTop.cpt
		(Binary files differ)

artsrc/code-anonymous.cpt
		(Binary files differ)

artsrc/code-anonymous.png

artsrc/code-joel.cpt
		(Binary files differ)

artsrc/code-joel.png

artsrc/code-rose.cpt
		(Binary files differ)

artsrc/code-rose.png

artsrc/elementFI.cpt
		(Binary files differ)

artsrc/elementGR.cpt
		(Binary files differ)

artsrc/elementME.cpt
		(Binary files differ)

artsrc/elementRE.cpt
		(Binary files differ)

artsrc/elementSE.cpt
		(Binary files differ)

artsrc/elementSU.cpt
		(Binary files differ)

artsrc/footer.cpt
		(Binary files differ)

artsrc/homenav-1-1.cpt
		(Binary files differ)

artsrc/homenav-1-2.cpt
		(Binary files differ)

artsrc/homenav-2-1.cpt
		(Binary files differ)

artsrc/homenav-2-2.cpt
		(Binary files differ)

artsrc/homenav-3-1.cpt
		(Binary files differ)

artsrc/homenav-3-2.cpt
		(Binary files differ)

artsrc/homenav-4-1.cpt
		(Binary files differ)

artsrc/homenav-4-2.cpt
		(Binary files differ)

artsrc/homenav-5-1.cpt
		(Binary files differ)

artsrc/homenav-5-2.cpt
		(Binary files differ)

artsrc/homenav-6-1.cpt
		(Binary files differ)

artsrc/homenav-6-2.cpt
		(Binary files differ)

artsrc/homenav-template.cpt
		(Binary files differ)

Show Entire File c/basic.js Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File c/jquery-1.4.1.js Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File c/styles.css Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File convert.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

i/00-hg.png

i/00-svn.png

i/00-tokyo.png

i/01-commit0.png

i/01-commit1.png

i/01-commit2.png

i/01-copies.png

i/02-commit0.png

i/02-repo-2.png

i/02-repo-3.png

i/02-repo-4.png

i/02-repo-5.png

i/02-repo-6.png

i/02-repo-7.png

i/02-repo.png

i/02-web-2.png

i/02-web.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/03-repo-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/03-repo.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/04-kdiff3-after.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/04-kdiff3.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/04-repo-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/04-repo.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/05-complex.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/05-kdiff3.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/05-repo-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/05-repo-3.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/05-repo-4.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/05-repo.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/arrow2.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/background.png
		(Binary files differ)

i/backgroundTop.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/cheat-module-test.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/cheatbot.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/cheatbot.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/cheatmiddle.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/cheatmiddle.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/cheattop.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/cheattop.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/cheattop10.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/code-anonymous-bottom.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/code-anonymous-middle.png
		(Binary files differ)

i/code-anonymous-top.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/code-joel-bottom.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/code-joel-middle.png
		(Binary files differ)

i/code-joel-top.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/code-rose-bottom.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/code-rose-middle.png
		(Binary files differ)

i/code-rose-top.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/edit-bot.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/editTopAfter.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/floyout.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/flyout.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/flyout.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/footer.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/getstarted.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/hg-panel.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-1-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-1-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-2-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-2-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-3-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-3-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-4-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-4-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-5-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-5-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-6-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/homenav-6-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/logo.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav1-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav1.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav2-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav2.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav3-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav3.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav4-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav4.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav5-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav5.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav6-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/nav6.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/shdaow.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/top-dropshadow.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

i/toptest.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

Show Entire File index.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Change 1 of 1 Show Entire File top/00.html Stacked
	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295	@@ -0,0 +1,295 @@ +`<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">`+`<html xmlns="http://www.w3.org/1999/xhtml">`+`<head>`+`<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />`+`<title>HgInit: Subversion Re-education</title>`++`<script src="c/jquery-1.4.1.js"></script>`+`<script src="c/basic.js"></script>`++`<link href="c/styles.css" rel="stylesheet" type="text/css" />`+`<script type="text/javascript">`+`var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");`+`document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));`+`</script>`+`<script type="text/javascript">`+`try {`+`var pageTracker = _gat._getTracker("UA-225715-20");`+`pageTracker._setDomainName("none");`+`pageTracker._setAllowLinker(true);`+`pageTracker._trackPageview();`+`} catch(err) {}</script>`+`</head>`+`<body>`++`<div id="kilnFlyOut">`+`<div class="flyoutscreenshot">`+`<img class="screenshot" src="i/dag.png" />`+`</div>`++`<div class="flyouttext">`+`<strong>Kiln gives you:</strong>`+`<ul>`+`<li class="first"><a class="selected thumbnail" data-src="i/dag.png" href="convert.html">Mercurial-based<br/>version control</a></li>`+`<li><a class="thumbnail" data-src="i/setup.png" href="convert.html">Straightforward<br/>setup</a></li>`+`<li class="last"><a class="thumbnail" data-src="i/review.png" href="convert.html">Seamless<br/>code review</a></li>`+`</ul>`+`<a class="convert" href="convert.html" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/flyout/freetrial.shop.fogcreek.com');"><img src="i/getstarted.gif" width="114" height="24" border="0" /></a>`+`</div>`++`<div class="flyoutteaser"><nobr><strong>Try Kiln free!</strong> Easy Mercurial hosting and more.</nobr></div>`+`</div>`++`<div class="toptop" align="left">`+`<ul>`+`<li align="center"><a href="http://www.joelonsoftware.com/" onClick="javascript: pageTracker._trackPageview('/outbound/toptop/joelonsoftware.com');">Joel on Software</a></li>`+`<li align="center"><a href="http://mercurial.selenic.com/" onClick="javascript: pageTracker._trackPageview('/outbound/toptop/mercurial.selenic.com');">Mercurial</a></li>`+`<li align="center"><a href="index.html">Home</a></li>`+`</ul>`+`</div>`+`<div id="dropshadow"></div>`+`<div id="topnav">`+`<div class="tInterior">`++`<a href="index.html">`+`<img src="i/logo.png" border="0" alt="HgInit Home" />`+`</a>`++`If you’ve been using Subversion, Mercurial is going to be confusing.`+`This tutorial covers the biggest differences in how Mercurial works.`+`If you’ve never used Subversion, just <a href="01.html">skip ahead</a>.`+`</div>`+`</div>`++`<div class="main">`++`<h1>`+`Subversion Re-education`+`</h1>`++`<div class="content">`++`<p>`+`When the programmers at my company decided to switch from Subversion to Mercurial, <em>boy</em> was I confused.`+`</p>`++<p>First, I came up with all kinds of stupid reasons why we shouldn’t switch. “We have to keep the repository on a central server, so it will be safe,” I said. You know what? I was wrong. In Mercurial every developer has a copy of the entire repository on their hard drive. It’s actually <em>safer</em>. And anyway, almost every Mercurial team uses a central repository, too, which you can back up compulsively, and you can build a three-ringed security zone complete with layers of Cylons, Stormtroopers, and adorable labradoodles (or whatever your IT department requires).</p>++`<p>“The trouble with distributed version control is that it makes it too easy to branch,” I said, “and branching always causes problems.” Turns out this was wrong, too. I was on a streak. Branching causes problems <em>in Subversion</em> because <em>Subversion</em> doesn’t store enough information to make <em>merging</em> work. In <em>Mercurial,</em> merging is painless and easy, and so branching is commonplace and harmless.</p>`++`<p>Then I said, “Fine, I’ll use it, but don’t expect me to be able to figure it out.” And I asked Jacob to make me a cheat sheet listing all the things that I normally did in Subversion, and the equivalent way to do them in Mercurial.</p>`++`<p>Now, I could show you this cheat sheet, but I won’t, because it messed up my brain for months.</p>`++`<p>It turns out that if you’ve been using Subversion, your brain is a little bit, um, how can I say this politely? You’re brain damaged. No, that’s not polite. You need a little re-education. I walked around brain damaged for six months thinking that Mercurial was <em>more</em> complicated than Subversion, but that was only because I didn’t understand how it really worked, and once I did, it turns out—hey presto!—it’s really kind of simple.</p>`++`<p>So I wrote this tutorial for you, in which I have been very careful <em>not</em> to explain things in terms of Subversion, because there is just no reason to cause any more brain damage. The world is brain damaged enough. Instead, for those of you who are coming from Subversion, I’ve got this one chapter at the beginning that will try to reverse as much damage as possible so that you can learn Mercurial from a clean slate.</p>`++`<p><strong>If you’ve never used Subversion, you can skip ahead to the next chapter (<a href="01.html">Ground Up Mercurial</a>) without missing anything.</strong></p>`++`<p>Ready? OK, let’s start with a short quiz.</p>`++`<p style="margin-left:2em;"><strong>Question 1.</strong> Do you write perfect code the first time?</p>`++`<p>If you answered “Yes” to question 1, you’re a liar and a cheat. You fail. Take the test again.</p>`++`<p>New code is buggy. It takes a while to get it working respectably. In the meantime, it can cause trauma for the other developers on the team.</p>`++`<p>Now, here’s how Subversion works:</p>`++`<ul>`+`<li>When you check new code in, everybody else gets it.</li>`+`</ul>`++`<p>Since all new code that you write has bugs, you have a choice.</p>`++`<ul>`+`<li>You can check in buggy code and drive everyone else crazy, or</li>`+`<li>You can avoid checking it in until it’s fully debugged.</li>`+`</ul>`++`<p>`+`Subversion always gives you this horrible dilemma. Either the repository is full of bugs because it includes new code that was just written, <em>or</em> new code that was just written is not in the repository.</p>`++`<p>As Subversion users, we are so used to this dilemma that it’s hard to imagine it not existing.</p>`++<p>Subversion team members often go days or weeks without checking anything in. In Subversion teams, newbies are terrified of checking any code in, for fear of breaking the build, or pissing off Mike, the senior developer, or whatever. Mike once got so angry about a checkin that broke the build that he stormed into an intern’s cubicle and swept off all the contents of his desk and shouted, “This is your last day!” (It wasn’t, but the poor intern practically wet his pants.)</p>++`<p>All this fear about checkins means people write code for weeks and weeks <em>without the benefit of version control</em> and then go find someone senior to help them check it in. Why have version control if you can’t use it?</p>`++`<p>Here’s a simple illustration of life under Subversion:</p>`++`<div class="i">`+`<img src="i/00-svn.png" />`+`</div>`++`<p>In Mercurial, <em>every developer has their own repository, living on their desktop:</em></p>`++`<div class="i">`+`<img src="i/00-hg.png" />`+`</div>`++`<p>So you can commit your code to your private repository, and get all the benefit of version control, whenever you like. Every time you reach a logical point where your code is a little bit better, you can commit it.</p>`++`<p>Once it’s solid, and you’re willing to let other people use your new code, you <em>push</em> your changes from your repository to a central repository that everyone else pulls from, and they finally see your code. When it’s ready.</p>`++`<p><em>Mercurial separates the act of committing new code from the act of inflicting it on everybody else.</em></p>`++`<p>And that means that you can commit (<strong>hg com</strong>) without anyone else getting your changes. When you’ve got a bunch of changes that you like that are stable and all is well, you push them (<strong>hg push</strong>) to the main repository.</p>`++`<h2>One more big conceptual difference</h2>`++`<p>You know how every single street has a name?</p>`++`<p><img src="i/00-tokyo.png" style="float:right; margin-left: 1em; margin-bottom: 1em; border: 1px solid black;" />Well, yeah, turns out that in Japan, not so much. They usually just number the <a href="http://sivers.org/jadr">blocks</a> in between the streets, and only very, very important streets get names.</p>`++`<p>There’s a similar difference between Subversion and Mercurial.</p>`++`<p>Subversion likes to think about <em>revisions</em>. A revision is what the entire file system looked like at some particular point in time.`+`</p>`++`<p>In Mercurial, you think about <em>changesets.</em> A changeset is a concise list of the changes between one revision and the next revision.</p>`++`<p>Six of one, half dozen of the other: what’s the difference?</p>`++`<p>Here’s the difference. Imagine that you and I are working on some code, and we branch that code, and we each go off into our separate workspaces and make lots and lots of changes to that code separately, so they have diverged quite a bit.</p>`++`<p>When we have to merge, Subversion tries to look at both revisions—my modified code, and your modified code—and it tries to guess how to smash them together in one big unholy mess. It usually fails, producing pages and pages of “merge conflicts” that aren’t really conflicts, simply places where Subversion failed to figure out what we did.</p>`++`<p>By contrast, while we were working separately in Mercurial, Mercurial was busy keeping a <em>series of changesets</em>. And so, when we want to merge our code together, Mercurial actually has a whole lot more information: it knows <em>what each of us changed</em> and can <em>reapply those changes</em>, rather than just looking at the final product and trying to guess how to put it together.</p>`++`<p>For example, if I change a function a little bit, and then move it somewhere else, Subversion doesn’t really remember those steps, so when it comes time to merge, it might think that a new function just showed up out of the blue. Whereas Mercurial will remember those things separately: function changed, function moved, which means that if you <em>also</em> changed that function a little bit, it is much more likely that Mercurial will successfully merge our changes.</p>`++`<p>Since Mercurial thinks of everything in terms of changesets, you get to do interesting things with those changesets. You can push them to a friend on the team to try them out, instead of pushing them to the central repository and inflicting them on everybody.</p>`++`<p>If this all seems a bit confusing, don’t worry—by the time you get through this tutorial, it’ll all make perfect sense. For now the most important thing to know is that because Mercurial thinks in terms of “changesets” instead of “revisions” <em>it can merge code much better than Subversion</em>.</p>`++`<p>And that means that <em>you can feel free to branch</em> because the merge isn’t going to be a nightmare.</p>`++<p>Want to know something funny? Almost every Subversion team I’ve spoken to has told me some variation on the very same story. This story is so common I should just name it “Subversion Story #1.” The story is this: at some point, they tried to branch their code, usually so that the shipping version which they gave their customers can be branched off separately from the version that the developers are playing with. And every team has told me that when they tried this, it worked fine, <em>until they had to merge</em>, and then it was a nightmare. What should have been a five minute process ended up with six programmers around a single computer working for two weeks trying to manually reapply every single bug fix from the stable build back into the development build.</p>++`<p>And almost every Subversion team told me that they vowed “never again,” and they swore off branches. And now what they do is this: each new feature is in a big #ifdef block. So they can work in one single trunk, while customers never see the new code until it’s debugged, and frankly, that’s ridiculous.</p>`++`<p>Keeping stable and dev code separate is <em>precisely what source code control is supposed to let you do</em>.</p>`++`<p>When you switch to Mercurial, you may not even realize it, but branching becomes possible again, and you don’t have to be afraid.</p>`++`<p>That means you can have team repositories, where a small team of programmers collaborates on a new feature, and when they’re done, they merge it into the main development repository, and <em>it works!</em></p>`++`<p>That means you can have a QA repository that lets the QA team try out the code. If it works, the QA team can push it up to the central repository, meaning, the central repository always has solid, tested code. And <em>it works!</em></p>`++`<p>That means you can run experiments in separate repositories, and if they work, you can merge them into the main repository, and if they don’t work, you can abandon them, and <em>it works!</em></p>`++`<h2>One last big conceptual difference</h2>`++`<p>The last major conceptual difference between Subversion and Mercurial is not as big a deal, but it will trip you up if you’re not aware of it, and here it is:</p>`++`<p>Subversion is basically revision control for <em>files,</em> but in Mercurial, revision control always applies to an entire directory—including all subdirectories.</p>`++<p>The main way you notice this is that in Subversion, if you go into a subdirectory and commit your changes, it only commits changes in that subdirectory and all directories below it, which potentially means you’ve forgotten to check something in that lives in some other subdirectory which also changed. Whereas, in Mercurial, all commands always apply to the entire tree. If your code is in <strong>c:\code</strong>, when you issue the <strong>hg commit</strong> command, you can be in <strong>c:\code</strong> or in <em>any subdirectory</em> and it has the same effect.</p>++`<p>This is not a big deal, but if you’re used to having one big gigantic repository for the whole company, where some people only check out and work on subdirectories that they care about, this isn’t a very good way to work with Mercurial—you’re better off having lots of smaller repositories for each project.</p>`++`<h2>And finally…</h2>`++`<p>Here’s the part where you’re just going to have to take my word for it.</p>`++`<p>Mercurial is better than Subversion.</p>`++`<p>It is a better way of working on source code with a team. It is a better way of working on source code by yourself.</p>`++`<p>It is just <em>better.</em></p>`++`<p>And, mark my words, if you understand the way Mercurial works, and you work the way Mercurial works, and you don’t try to fight it, and you don’t try to do things the old Subversion way using Mercurial but instead you learn to work the way Mercurial expects you to work, you will be happy, successful, and well-fed, and you’ll always be able to find the remote control to the TV.</p>`++`<p>And in the early days, you will be tempted, I know you will, to give up on Mercurial and go back to Subversion, because it will be strange, like living in a foreign country, and you’ll be homesick, and you will come up with all kinds of rationalizations, like, for example, you will claim that Mercurial working directories take up too much disk space, which is bologna, because, actually, they usually take up less space than Subversion directories. (It’s true!)</p>`++`<p>And then you’ll go back to Subversion because you tried to branch the Subversion way, and you got confused, and it didn’t work so well, because you really should have been branching the Mercurial way, by cloning repositories, not by trying to do the things that work in Subversion, but by learning the Mercurial way of doing things, which, trust me, <em>works.</em></p>`++`<p>And then you’ll get Jacob, or whoever the equivalent of Jacob is at your office, to give you the “Subversion to Mercurial cheat sheet,” and you’ll spend three months thinking that <strong>hg fetch</strong> is just like <strong>svn up</strong>, without really knowing what <strong>hg fetch</strong> does, and one day, things will go wrong and you’ll blame Mercurial, when you really should be blaming yourself for not understanding how Mercurial works.</p>`++`<p>I know you’ll do that because that is what I did.</p>`++<p>Don’t make the same mistake. Learn Mercurial, trust Mercurial, and figure out how to do things the Mercurial way, and you will move an entire generation ahead in source code control. While your competitors are busy taking a week to resolve all the merge conflicts they got when a vendor updated a library, you’re going to type <strong>hg merge</strong> and say to yourself, “Oh gosh, that’s cool, it just worked.” And Mike will chill out and share a doobie with the interns, and soon it will be spring and the kids at the nearby college will trade in their heavy parkas for skimpy A&F pre-torn T-shirts, and life will be good.</p>+++`<div class="footer">`+`<div class="footernav" id="home" align="center"><a href="index.html"><span class="angleQuote">«</span> Home</a></div>`+`<div class="footernav" id="comingup">Coming up: Mercurial<br />from the ground up.</div>`+`<div class="footernav" id="next" align="center"><a href="01.html">Next <span class="angleQuote">»</span></a></div>`+++`</div>`+`<div class="pagebottom">`++`<div class="bottomimg">`+`<a href="http://www.kilnhg.com" target="_blank" id="logoLink" title="KilnHg.com" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/klinhg.com');"> </a>`+`<div class="bottomtext">This tutorial was brought to you by the fine folks at Fog Creek Software, makers of Kiln, a version control system powered by Mercurial</div>`++`<div class="bottomtext"><strong>Kiln gives you:</strong><br />`++`• A complete version control system based on <a href="http://mercurial.selenic.com/" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/mercurial.selenic.com');">Mercurial</a><br />`+`• <a href="http://fogcreek.com/kiln/learnmore.html#hist_BranchAndMerge" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/branchandmerge.kilnhg.com');">Branching and merging</a> that really works<br />`+`• <a href="http://fogcreek.com/kiln/learnmore.html#hist_Tools" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/tools.kilnhg.com');">Straightforward setup</a> on your server, or simple secure hosting on ours<br />`+`• Seamlessly integrated <a href="http://fogcreek.com/kiln/learnmore.html#hist_StartReviewsEffortlessly" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/startreviews.kilnhg.com');">code review</a><br />`+`</div>`++`<div class="bottomtext getStarted">`+`<a href="convert.html" target="_blank" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/freetrial.shop.fogcreek.com');"><img src="i/getstarted.gif" width="114" height="24" border="0" /></a>`+`</div>`++`</div>`+`<div class="about">`++`<p>`+`<strong>Any questions?</strong>`+`</p>`++`<p>`+`If you have any questions about the material in this tutorial,`+`no matter how newbie, ask them at <a href="http://kiln.stackexchange.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/kiln.stackexchange.com');">the`+`Kiln Knowledge Exchange.</a>`+`</p>`++`<p>`+`<strong>About the author.</strong>`+`</p>`++`<p>`+Joel Spolsky is the founder of <a href="http://fogcreek.com" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/fogcreek.com');">Fog Creek Software</a>, a New York company that proves that you can treat programmers well and still be profitable. Programmers get private offices, free lunch, and work 40 hours a week. Customers only pay for software if they’re delighted. Fog Creek makes <a href="http://www.fogbugz.com" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/fogbugz.com');">FogBugz</a>, <a href="http://www.kilnhg.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/text.kilnhg.com');">Kiln</a>, and <a href="https://www.copilot.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/copilot.com');">Fog Creek Copilot</a>. Joel's blog <a href="http://www.joelonsoftware.com/" onClick="javascript: pageTracker._trackPageview('/outbound/bottom/joelonsoftware.com');">Joel on Software</a> is read by programmers everywhere.++`</p>`++`</div>`+++`<!-- close bottom div -->`+`</div>`+++`<!-- close "content" column -->`+`</div>`++`<!-- close "main" div -->`+`</div>`++`<!-- bottom grey bar -->`+`<div class="botbot" align="left">`+`</div>`++`<!-- Google Website Optimizer Tracking Script -->`+`<script type="text/javascript">`+`if(typeof(_gat)!='object')document.write('<sc'+'ript src="http'+`+`(document.location.protocol=='https:'?'s://ssl':'://www')+`+`'.google-analytics.com/ga.js"></sc'+'ript>')</script>`+`<script type="text/javascript">`+`try {`+`var gwoTracker=_gat._getTracker("UA-225715-15");`+`gwoTracker._trackPageview("/2687020024/test");`+`}catch(err){}</script>`+`<!-- End of Google Website Optimizer Tracking Script -->`++`</body>`++`</html>`+

Show Entire File top/01.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File top/02.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File top/03.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File top/04.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File top/05.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

top/arrow.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

Show Entire File top/c/basic.js Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File top/c/jquery-1.4.1.js Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File top/c/styles.css Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Show Entire File top/convert.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

top/i/00-hg.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/00-svn.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/00-tokyo.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/01-commit0.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/01-commit1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/01-commit2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/01-copies.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/02-commit0.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/02-repo-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/02-repo-3.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/02-repo-4.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/02-repo-5.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/02-repo-6.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/02-repo-7.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/02-repo.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/02-web-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/02-web.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/03-repo-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/03-repo.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/04-kdiff3-after.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/04-kdiff3.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/04-repo-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/04-repo.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/05-complex.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/05-kdiff3.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/05-repo-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/05-repo-3.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/05-repo-4.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/05-repo.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/Thumbs.db
		(Binary files differ)

top/i/arrow2.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/background.png
		(Binary files differ)

top/i/backgroundTop.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/cheat-module-test.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/cheatbot.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/cheatbot.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/cheatmiddle.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/cheatmiddle.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/cheattop.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/cheattop.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/cheattop10.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/code-anonymous-bottom.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/code-anonymous-middle.png
		(Binary files differ)

top/i/code-anonymous-top.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/code-joel-bottom.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/code-joel-middle.png
		(Binary files differ)

top/i/code-joel-top.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/code-rose-bottom.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/code-rose-middle.png
		(Binary files differ)

top/i/code-rose-top.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/dag.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/edit-bot.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/editTopAfter.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/floyout.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/flyout.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/flyout.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/footer.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/getstarted.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/hg-panel.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-1-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-1-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-2-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-2-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-3-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-3-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-4-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-4-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-5-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-5-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-6-1.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/homenav-6-2.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/logo.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav1-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav1.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav2-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav2.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav3-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav3.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav4-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav4.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav5-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav5.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav6-bot.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/nav6.jpg

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/review.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/setup.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/shdaow.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/top-dropshadow.png

This image was not loaded automatically because this changeset is very large. Click to load this image...

top/i/toptest.gif

This image was not loaded automatically because this changeset is very large. Click to load this image...

Show Entire File top/index.html Stacked
		This file's diff was not loaded because this changeset is very large. Load changes Loading...

Diff Options

tip initial

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

tip initial

Diff to 227c14606159

Attach a Trello Card

Add a tag

Your session has expired