Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/simple-merge @ 322:a0acae914e95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: Fix reloading of index -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: Fix reloading of index We were reloading every request because we weren't saving the old mtime. manifest hash: 507330727957ff53c48b38f427f0b70469a49271 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCreVpywK+sNU5EO8RAp/YAJ9cXh2II4DGAQtRc58yj4hi49C8jgCfT7bV 22w73T2FiYBjzMk8N8STUVI= =eghX -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 13 Jun 2005 11:58:33 -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