tests/simple-merge
author mpm@selenic.com
Tue, 07 Jun 2005 00:21:53 -0800
changeset 271 35acefbf0ae6
parent 28 9f64ee817199
permissions -rw-r--r--
hgweb: ignore pipe errors -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: ignore pipe errors manifest hash: 3a3baaa175a422bf499f414b5186ed551827db56 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpVkhywK+sNU5EO8RAo5aAJ9KPR/Gwp8YBswhyKqzVYVlgBl49ACghr65 sGKxB7ctoX9XB1WDht8WUzk= =J2bp -----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