Mercurial > hg > mercurial-crew-with-dirclash
annotate 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 |
rev | line source |
---|---|
331 | 1 + mkdir test |
2 + cd test | |
3 + echo foo | |
4 + hg init | |
5 + hg addremove | |
6 + hg commit -t 1 | |
7 + hg verify | |
8 checking changesets | |
9 checking manifests | |
10 crosschecking files in changesets and manifests | |
11 checking files | |
12 1 files, 1 changesets, 1 total revisions | |
13 + cd .. | |
14 + mkdir branch | |
15 + cd branch | |
16 + hg init ../test | |
17 + hg co | |
18 + echo bar | |
19 + hg commit -t 2 | |
20 + cd ../test | |
21 + hg pull ../branch | |
404 | 22 pulling from ../branch |
331 | 23 searching for changes |
24 adding changesets | |
25 adding manifests | |
26 adding file revisions | |
27 modified 1 files, added 1 changesets and 1 new revisions | |
404 | 28 (run 'hg update' to get a working copy) |
331 | 29 + hg verify |
30 checking changesets | |
31 checking manifests | |
32 crosschecking files in changesets and manifests | |
33 checking files | |
34 1 files, 2 changesets, 2 total revisions | |
35 + hg co | |
36 + cat foo | |
37 foo | |
38 bar | |
39 + hg manifest | |
40 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |