Update

hg update [-C] [-d DATE] [[-r] REV]

An update brings the working directory into sync with a particular changeset (the tip by default), which then becomes the parent revision for the working directory.

After a pull, an update may involve performing a merge or resolving a conflict.

Help text: http://www.selenic.com/mercurial/hg.1.html#update

Notes

Update merges outstanding changes

If the requested revision is a descendant of the working directory, any outstanding changes in the working directory will be merged into the result:

$ hg init t
$ cd t
$ echo a > a
$ hg ci -Am adda
adding a
$ echo b >> a
$ hg ci -Am changea
$ hg up -C 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c >> a
$ hg st
M a
$ hg up
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg st
M a

CategoryCommand