Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/manifest-bug @ 272:467cea2bf2d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: use tab to separate date from filename -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 diff: use tab to separate date from filename manifest hash: 73812de990e0e787320c11f7bd83c4ca91a52c4c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpdDxywK+sNU5EO8RAhKwAKCFcUa/p6ALbjoOl4I8VKJknZtu7gCdFvoE HQn1iq4gnJoeurB7YLMRpqc= =ltYP -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 07 Jun 2005 08:53:05 -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 #!/bin/sh -x
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
2
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
3 set +e
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 BASE=foo.base
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
6 BR1=foo.br1
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
7 BR2=foo.br2
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
8 BR2_1=foo.br2_1
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
9
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
10 mkdir $BASE
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
11 cd $BASE
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
12 hg init
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
13 echo test > file
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
14 hg add file
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
15 EDITOR="echo 'initial commit' > " hg commit
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
16 cd ..
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
17
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
18 mkdir $BR1
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
19 cd $BR1
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
20 hg branch ../$BASE
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
21 hg checkout
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
22 echo test > file1
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
23 hg addremove
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
24 EDITOR="echo side commit >" hg commit
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
25 cd ..
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
26
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
27 mkdir $BR2
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
28 cd $BR2
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
29 hg branch ../$BASE
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
30 hg checkout
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
31 echo yet more >> file2
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
32 hg addremove
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
33 EDITOR="echo second update >" hg commit
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
34 cd ..
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
35
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
36 mkdir $BR2_1
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
37 cd $BR2_1
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
38 hg branch ../$BR2
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
39 hg checkout
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
40 EDITOR="echo commit merge >" hg merge ../$BR1
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
41
9f64ee817199 Add some tests to the repo
mpm@selenic.com
parents:
diff changeset
42 hg checkout