hg update does nothing

[Mads Kiilerich]

Stephen Rasku wrote, On 11/01/2009 01:34 PM:
> I have been using Mercurial to track changes to various files in my
> home directory in Ubuntu.  I just installed Koala and I copied the .hg
> directory from my backup to my home directory.  I want to restore the
> latest version of the files but "hg update" doesn't seem to do
> anything:
>
> $ hg status | grep -v ^?
> M .bashrc
> ! .hgignore
> ! .hgrc
> ! .ssh/authorized_keys
> ! .ssh/config
> ! .vimrc
> ! Music/Playlists/Grassy Hill Radio.pls

"hg help status" says
     ! = missing (deleted by non-hg command, but still tracked)

> $ hg up -r tip
> 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

"hg update" just changes the parent revision of your working directory 
and updates the working directory with the changes happened between the 
old and new parent revision. When the parent revision isn't changed it 
doesn't update anything.

You could use "hg up -C", but that would loose your changes to .bashrc.

You could use "hg revert" and specify the files it should restore in 
your working directory. "--all" will also revert your changes to .bashrc.

/Mads