view tests/test-undo.out @ 404:a1ecef497721

[PATCH] Unintuive use

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[PATCH] Unintuive use

From: Vincent Danjean <[e-mail]>

> 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 t
+ cd t
+ hg init
+ echo a
+ hg add a
+ hg commit -t test -u test -d '0 0'
+ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
+ hg parents
changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     test

+ hg status
+ hg undo
attempting to rollback last transaction
+ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions
+ hg parents
+ hg status
A a