annotate tests/simple-merge @ 87:b2b3fdbd79f4

Verify improvements: Check existence of parents of changesets and manifests Count errors Use ui for display Catch and count unpack exceptions Print error count and exit with non-zero status on error
author mpm@selenic.com
date Tue, 17 May 2005 12:23:53 -0800
parents 9f64ee817199
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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