How to use Mercurial?

[TK Soh]

On Thu, Apr 8, 2010 at 2:51 PM, Jon Ribbens
<jon-mercurial at unequivocal.co.uk> wrote:
> We have a "central" hg repository, and then various checked out copies
> in which we work on various projects. Different projects may push
> things back to the central repository at various times.
>
> If we want to make sure a project repository has all the latest
> changes from the central repository, we do 'hg pull -u', which
> then requires a 'hg merge' and 'hg ci -m merge'. However, if
> the working directory is dirty this involves all sorts of nastiness
> with 'hg merge -f' and manually keeping track of which changed files
> are changed due to the "pull -u" and which were already changed
> locally.
>
> This is obviously a mess. How are you *supposed* to use hg in this
> circumstance? So far, 'cvs' (which we were using before) is winning
> - 'cvs up' just Did The Right Thing without complaint.

IMO, it is actually a design flow for CVS and the like to do so.
Though, to be fair, given the design of CVS (being of older
technology), I am not sure there's a better way to handle this. That's
why I stop using it totally after starting to use Mercurial.