Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/simple-merge @ 193:0a28dfe59f8f 0.5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump the version number to 0.5b for the protocol change -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Bump the version number to 0.5b for the protocol change manifest hash: a7930fa15b716eb90613bd761b47c27331ea4b8b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmz7pywK+sNU5EO8RAt7dAJ4qmUpDRS7/JP/JpLm8uXZ0c+5W/ACfVb0Q 99rjYslSjJfOWYLCKiAzVyU= =WVVg -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 30 May 2005 08:27:21 -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