One other thing. I've found that when making commits like http://hg.adium.im/adium-1.4/rev/07a3fd67571f -- i.e. ones that are bugs exposed by the feature branch, or other changes or unrelated cleanup -- that it's best to make them on default and then do `hg up -c feature-branch && hg merge default`, which will merge the two.
Keeping stuff on default as much as possible and frequent merges of default into the feature branches has worked out well for me when doing this kind of development. Granted, I was working alone, but it made the final merge a lot less painful (esp. since there were other feature branches). -Colin On Mar 17, 2011, at 1:24 AM, Colin Barrett wrote: > http://hg.adium.im/adium-1.4/graph > > It doesn't really matter that they're in there (hg bisect don't care ;) but > you *can* prevent them. Especially when switching around between branches and > going back within history, it's really easy to make a commit on top of an old > version, or try and do a merge from a crazy revision. > > Before you do a merge or commit, use the `hg parent` command to check what > the parent rev of the current working directory is -- if it doesn't look like > tip, run an `hg up`. You can also use `hg parents` see both parents when > you're int he process of merging. > > -Colin
