Mercurial > hg

annotate tests/test-merge2 @ 605:8e82fd763be2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] Get "hg serve" to optionally log accesses and errors to files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Get "hg serve" to optionally log accesses and errors to files From: Bryan O'Sullivan <bos@serpentine.com> Get "hg serve" to log accesses and errors to files. manifest hash: 573ef524d84cc7d2777f5fd982f2ef47f4bcf668 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyMA5ywK+sNU5EO8RAp1eAJoD6Qqy6XcGInzZKdo0Qp7gLttYzACfRywL fSGapmCAIaZPoBvoxXTk8Zo= =ZicU -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sun, 03 Jul 2005 20:51:05 -0800
parents feadc9697b43
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
1 #!/bin/sh -x
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
2
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
3 mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
4 cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
5 hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
6 echo This is file a1 > a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
7 hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
8 hg commit -t "commit #0" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
9 echo This is file b1 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
10 hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
11 hg commit -t "commit #1" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
12 rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
13 hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
14 echo This is file b2 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
15 hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
16 hg commit -t "commit #2" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
17 cd ..; /bin/rm -rf t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
18
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
19 mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
20 cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
21 hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
22 echo This is file a1 > a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
23 hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
24 hg commit -t "commit #0" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
25 echo This is file b1 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
26 hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
27 hg commit -t "commit #1" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
28 rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
29 hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
30 echo This is file b2 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
31 hg commit -A -t "commit #2" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
32 cd ..; /bin/rm -rf t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
33
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
34 mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
35 cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
36 hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
37 echo This is file a1 > a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
38 hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
39 hg commit -t "commit #0" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
40 echo This is file b1 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
41 hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
42 hg commit -t "commit #1" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
43 rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
44 hg remove b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
45 hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
46 echo This is file b2 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
47 hg commit -A -t "commit #2" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
48 cd ..; /bin/rm -rf t