Mercurial > hg > pyhgsh

comparison tests/test-simple-update.out @ 404:a1ecef497721

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
comparison
equal deleted inserted replaced
403:fda7bb480020 404:a1ecef497721
17 + hg co 17 + hg co
18 + echo bar 18 + echo bar
19 + hg commit -t 2 19 + hg commit -t 2
20 + cd ../test 20 + cd ../test
21 + hg pull ../branch 21 + hg pull ../branch
22 pulling from ../branch
22 searching for changes 23 searching for changes
23 adding changesets 24 adding changesets
24 adding manifests 25 adding manifests
25 adding file revisions 26 adding file revisions
26 modified 1 files, added 1 changesets and 1 new revisions 27 modified 1 files, added 1 changesets and 1 new revisions
28 (run 'hg update' to get a working copy)
27 + hg verify 29 + hg verify
28 checking changesets 30 checking changesets
29 checking manifests 31 checking manifests
30 crosschecking files in changesets and manifests 32 crosschecking files in changesets and manifests
31 checking files 33 checking files