annotate tests/test-copy @ 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 |
ae96b7e1318d |
| children |
512d76558bd4 50da4bb9cab6 |
| rev |
line source |
|
363
|
1 #!/bin/bash
|
|
|
2
|
|
|
3 set -x
|
|
|
4 hg init
|
|
|
5 echo a > a
|
|
|
6 hg add a
|
|
|
7 hg commit -t "1" -u test -d "0 0"
|
|
|
8 hg status
|
|
|
9 cp a b
|
|
|
10 hg copy a b
|
|
|
11 hg status
|
|
|
12 hg -d commit -t "2" -u test -d "0 0"
|
|
|
13 hg history
|
|
|
14 hg log a
|
|
|
15 hexdump -C .hg/data/b.d
|
|
|
16 hg cat b | md5sum
|
|
|
17 hg cat a | md5sum
|
|
|
18 hg verify
|
