tests/simple-merge
author mpm@selenic.com
Wed, 25 May 2005 16:21:06 -0800
changeset 157 2653740d8118
parent 28 9f64ee817199
permissions -rw-r--r--
Install the templates where they can be found by hgweb.py This ought to use package_data but that doesn't exist in Python 2.3. So we do a hack of install_data and use glob. This also adds templatepath() to hgweb.py which finds the templates relative to hgweb.py's location.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
     1
set -ex
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
     2
export EDITOR=true
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
     3
rm -rf test branch
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
     4
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
     5
mkdir test
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
     6
cd test
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
     7
echo foo>foo
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
     8
hg init
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
     9
hg addremove
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    10
hg commit
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    11
hg verify
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    12
cd ..
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    13
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    14
cp -a test branch
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    15
cd branch
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    16
echo bar>>foo
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    17
hg commit
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    18
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    19
cd ../test
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    20
hg merge ../branch
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    21
hg verify
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
    22