##// END OF EJS Templates
Add test for invalid branch cache (fixed by 27ebe4efe98e)
Thomas Arendsen Hein -
r3451:196baf20 default
parent child Browse files
Show More
@@ -1,26 +1,28 b''
1 #!/bin/sh
1 #!/bin/sh
2
2
3 hg init t
3 hg init t
4 cd t
4 cd t
5
5
6 echo foo > a
6 echo foo > a
7 hg add a
7 hg add a
8 hg ci -m "initial" -d "0 0"
8 hg ci -m "initial" -d "0 0"
9 echo foo > .hg/branch
9 echo foo > .hg/branch
10 hg ci -m "add branch name" -d "0 0"
10 hg ci -m "add branch name" -d "0 0"
11 echo bar > .hg/branch
11 echo bar > .hg/branch
12 hg ci -m "change branch name" -d "0 0"
12 hg ci -m "change branch name" -d "0 0"
13 rm .hg/branch
13 rm .hg/branch
14 hg ci -m "clear branch name" -d "0 0"
14 hg ci -m "clear branch name" -d "0 0"
15
15
16 hg co foo
16 hg co foo
17 cat .hg/branch
17 cat .hg/branch
18 echo bleah > a
18 echo bleah > a
19 hg ci -m "modify a branch" -d "0 0"
19 hg ci -m "modify a branch" -d "0 0"
20
20
21 hg merge
21 hg merge
22 cat .hg/branch
22 cat .hg/branch
23 HG_MERGE=true hg ci -m "merge" -d "0 0"
23 HG_MERGE=true hg ci -m "merge" -d "0 0"
24 hg log
24 hg log
25
25
26
26 echo % test for invalid branch cache
27 hg rollback
28 hg tip
@@ -1,43 +1,53 b''
1 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 foo
2 foo
3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit)
4 (branch merge, don't forget to commit)
5 foo
5 foo
6 changeset: 5:dc140083783b
6 changeset: 5:dc140083783b
7 branch: foo
7 branch: foo
8 tag: tip
8 tag: tip
9 parent: 4:98d14f698afe
9 parent: 4:98d14f698afe
10 parent: 3:9d567d0b51f9
10 parent: 3:9d567d0b51f9
11 user: test
11 user: test
12 date: Thu Jan 01 00:00:00 1970 +0000
12 date: Thu Jan 01 00:00:00 1970 +0000
13 summary: merge
13 summary: merge
14
14
15 changeset: 4:98d14f698afe
15 changeset: 4:98d14f698afe
16 branch: foo
16 branch: foo
17 parent: 1:0079f24813e2
17 parent: 1:0079f24813e2
18 user: test
18 user: test
19 date: Thu Jan 01 00:00:00 1970 +0000
19 date: Thu Jan 01 00:00:00 1970 +0000
20 summary: modify a branch
20 summary: modify a branch
21
21
22 changeset: 3:9d567d0b51f9
22 changeset: 3:9d567d0b51f9
23 user: test
23 user: test
24 date: Thu Jan 01 00:00:00 1970 +0000
24 date: Thu Jan 01 00:00:00 1970 +0000
25 summary: clear branch name
25 summary: clear branch name
26
26
27 changeset: 2:ed2bbf4e0102
27 changeset: 2:ed2bbf4e0102
28 branch: bar
28 branch: bar
29 user: test
29 user: test
30 date: Thu Jan 01 00:00:00 1970 +0000
30 date: Thu Jan 01 00:00:00 1970 +0000
31 summary: change branch name
31 summary: change branch name
32
32
33 changeset: 1:0079f24813e2
33 changeset: 1:0079f24813e2
34 branch: foo
34 branch: foo
35 user: test
35 user: test
36 date: Thu Jan 01 00:00:00 1970 +0000
36 date: Thu Jan 01 00:00:00 1970 +0000
37 summary: add branch name
37 summary: add branch name
38
38
39 changeset: 0:db01e8ea3388
39 changeset: 0:db01e8ea3388
40 user: test
40 user: test
41 date: Thu Jan 01 00:00:00 1970 +0000
41 date: Thu Jan 01 00:00:00 1970 +0000
42 summary: initial
42 summary: initial
43
43
44 % test for invalid branch cache
45 rolling back last transaction
46 changeset: 4:98d14f698afe
47 branch: foo
48 tag: tip
49 parent: 1:0079f24813e2
50 user: test
51 date: Thu Jan 01 00:00:00 1970 +0000
52 summary: modify a branch
53
General Comments 0
You need to be logged in to leave comments. Login now