Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-simple-update.out @ 404:a1ecef497721
[PATCH] Unintuive use
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Unintuive use
From: Vincent Danjean <vdanjean.ml@free.fr>
> 1) "hg pull" does not tell what and if it does something.
> 2) hg does not tell if the data have been merge or not, if we have to
> call resolve, ...
Here is a patch for 1) and 2). It also add an option to 'pull' to call
update if there is something new.
Tweaked by mpm:
- change message style
- use ui.status
- change option from resolve to update
manifest hash: a61a7af00ef2f33867f6c88f95dc8258cb1a3e51
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuMcpywK+sNU5EO8RAucjAKC06gwAico7Wz5YOcp5u9NVxEhItwCfcIzA
VmiifZTj5ZUjTTcPhmiKh2M=
=rbLT
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 18:04:25 -0800 |
parents | b4e0e20646bb |
children | 688d03d6997a |
line wrap: on
line diff
--- a/tests/test-simple-update.out +++ b/tests/test-simple-update.out @@ -19,11 +19,13 @@ 1 files, 1 changesets, 1 total revisions + hg commit -t 2 + cd ../test + hg pull ../branch +pulling from ../branch searching for changes adding changesets adding manifests adding file revisions modified 1 files, added 1 changesets and 1 new revisions +(run 'hg update' to get a working copy) + hg verify checking changesets checking manifests