unify checkout and resolve into update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
unify checkout and resolve into update
This replaces checkout and resolve with a single command:
$ hg help co
hg update [node]
update or merge working directory
If there are no outstanding changes in the working directory and
there is a linear relationship between the current version and the
requested version, the result is the requested version.
Otherwise the result is a merge between the contents of the
current working directory and the requested version. Files that
changed between either parent are marked as changed for the next
commit and a commit must be performed before any further updates
are allowed.
manifest hash: 513d285d7fb775d0560de49387042a685ea062f7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFComS7ywK+sNU5EO8RAmgRAJ96GA6qvHLy0Jp0fzUrR2os2azPuACePsdC
YBldZtA7yIuTnV2vIbn7OSE=
=QtM/
-----END PGP SIGNATURE-----
author |
mpm@selenic.com |
date |
Sat, 04 Jun 2005 18:34:35 -0800 |
parents |
4ec26766be83 |
children |
ff8fbf99cd64 |
rev |
line source |
66
|
1 d40cc5aacc31ed673d9b5b24f98bee78c283062c 0.4f
|
|
2 1c590d34bf61e2ea12c71738e5a746cd74586157 0.4e
|
|
3 7eca4cfa8aad5fce9a04f7d8acadcd0452e2f34e 0.4d
|
|
4 b4d0c3786ad3e47beacf8412157326a32b6d25a4 0.4c
|
189
|
5 f40273b0ad7b3a6d3012fd37736d0611f41ecf54 0.5
|
194
|
6 0a28dfe59f8fab54a5118c5be4f40da34a53cdb7 0.5b
|