How to use Mercurial?

[TK Soh]

On Thu, Apr 8, 2010 at 2:54 PM, Dirkjan Ochtman <dirkjan at ochtman.nl> wrote:
> On Thu, Apr 8, 2010 at 16:51, Jon Ribbens
> <jon-mercurial at unequivocal.co.uk> wrote:
>> 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.
>
> Yeah, you're not supposed to have a dirty working dir while merging.
> You should probably wait with merging until you have the local changes
> committed.

This is good practice, and probably should be enforced by hg itself.
Any reasons why the --force option is there in hg merge?

> Using hg pull --rebase (after enabling the rebase extension) may also
> help here, but you should read up on what rebasing is exactly, first.
>
> Cheers,
>
> Dirkjan