tests/test-simple-update.out
author mpm@selenic.com
Tue, 21 Jun 2005 18:04:25 -0800
changeset 404 a1ecef497721
parent 350 b4e0e20646bb
child 429 688d03d6997a
permissions -rw-r--r--
[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-----

+ mkdir test
+ cd test
+ echo foo
+ hg init
+ hg addremove
+ hg commit -t 1
+ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
+ cd ..
+ mkdir branch
+ cd branch
+ hg init ../test
+ hg co
+ echo bar
+ 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
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
+ hg co
+ cat foo
foo
bar
+ hg manifest
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo