We will soon start replacing ClearCase with Mercurial. I hear this is a good thing. The change model vs. the version model. Wave of the future. I’m prepared to believe this. Still, it kind of frightens me. Hey, it took Joel Spolsky a while to grok the difference and how to get maximum advantage out of Mercurial, so I’m betting I will run into conceptual traps and pitfalls.
Does anyone have any real-world “how to grok Mercurial” tips? Anything specific suggestions that will help me bridge the conceptual gap. Any warnings about things not to do? I’d appreciate hearing them. I’ve already read the closest questions on SO related to this topic, as well as the Mercurial tour and a number of other blogs. I’m mainly interested in any gotchas or uh-ohs I may encounter. Any wisdom you can impart will be appreciated.
The peepcode meet mercurial video is worth the hour and $9.
As far as gotcha’s I’d say the biggest way I see people fail on mercurial is to get too hung up on “how they used to do things” instead of focusing on “why they did those things”.
People will beat their heads against mercurial’s distributed nature to fake up file-locking but they do that because merging used to be hard and now it isn’t.
Or people will try to get revision ids automatically updated into their files because it used to be possible to have a checkout at different revision points for each file. It no longer is, so having it in just one place is fine and that place is usually
hg id.Or here’s a biggie — mercurial makes indelible changes — after you’ve commited / pushed a change there’s no easy way (and plenty of hard/bad ways) to subsequently alter that change. You can negate its effect but you can’t recall and destroy it. The first time someone pushes a change they wish they hadn’t they go through this sequence:
and then they do one of two things either:
or
One last thing, make an informed decision about which of the many possible ways to branch you select. I like option one in that article, and its author prefer’s a different one, but it gives a great compare contrast.