tests/test-help
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 849 8933ef744325
child 871 c2e77581bc84
child 874 d4cb383e7de7
child 894 62ec665759f2
child 896 01215ad04283
permissions -rwxr-xr-x
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
544
3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 429
diff changeset
     1
#!/bin/sh
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     2
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
     3
hg
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
     4
hg -q
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 547
diff changeset
     5
hg help
423
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 350
diff changeset
     6
hg -q help
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     7
hg add -h
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 547
diff changeset
     8
hg add --skjdfks
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     9
hg help diff
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    10
hg help status
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    11
hg -q help status
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    12
hg help foo
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 814
diff changeset
    13
hg skjdfks
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    14
423
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 350
diff changeset
    15
exit 0