tests/test-copy
author mpm@selenic.com
Tue, 21 Jun 2005 18:04:25 -0800
changeset 404 a1ecef497721
parent 363 ae96b7e1318d
child 462 512d76558bd4
child 464 50da4bb9cab6
permissions -rwxr-xr-x
[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-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/bash
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     2
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     3
set -x
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     4
hg init
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     5
echo a > a
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     6
hg add a
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     7
hg commit -t "1" -u test -d "0 0"
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     8
hg status
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     9
cp a b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    10
hg copy a b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    11
hg status
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    12
hg -d commit -t "2" -u test -d "0 0"
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    13
hg history
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    14
hg log a
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    15
hexdump -C .hg/data/b.d
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    16
hg cat b | md5sum
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    17
hg cat a | md5sum
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    18
hg verify