On Mar 17, 2011, at 3: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

'hg summary' will tell you if you're not all the way up to date, as well as 
show a variety of other useful information.

Reply via email to