tests/simple-merge
author mpm@selenic.com
Wed, 08 Jun 2005 17:08:55 -0800
changeset 290 07c6cb9fd1c5
parent 28 9f64ee817199
permissions -rw-r--r--
replace hg branch with hg init [source] -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 replace hg branch with hg init [source] This does the hardlink trick if both repos are on the same filesystem, otherwise it does a pull. manifest hash: 780a3a0aca6e4a535909c6221ee94394701ec1c9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp5anywK+sNU5EO8RArdDAJ9Tiia0YZmZ6xiTYdKhZJ2UZY8V5wCfeoPy DamQ2Zyz3yTjNqu4ge0CuRQ= =EXv5 -----END PGP SIGNATURE-----
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