tests/test-diffdir
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Apr 2006 21:38:59 +0200
changeset 2044 b343e7d454b4
parent 1933 7544700fd931
child 3192 096f1c73cdc3
permissions -rwxr-xr-x
Don't allow --style and --template for hg update and hg merge. The only way that changesets will be shown with these command is in an error message when trying to update to an ambiguous branch name.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/sh
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     2
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     3
hg init
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     4
touch a
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     5
hg add a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1723
diff changeset
     6
hg ci -m "a" -d "1000000 0"
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     7
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     8
echo 123 > b
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
     9
hg add b
949
d997148155f2 test fixes for Solaris 2.6
TK Soh <teekaysoh@yahoo.com>
parents: 814
diff changeset
    10
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
d997148155f2 test fixes for Solaris 2.6
TK Soh <teekaysoh@yahoo.com>
parents: 814
diff changeset
    11
              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
    12
949
d997148155f2 test fixes for Solaris 2.6
TK Soh <teekaysoh@yahoo.com>
parents: 814
diff changeset
    13
hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
d997148155f2 test fixes for Solaris 2.6
TK Soh <teekaysoh@yahoo.com>
parents: 814
diff changeset
    14
                     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
1723
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 981
diff changeset
    15
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 981
diff changeset
    16
echo foo > a
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 981
diff changeset
    17
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 981
diff changeset
    18
              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"