##// 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 1 #!/bin/sh
2 2
3 3 hg init t
4 4 cd t
5 5
6 6 echo foo > a
7 7 hg add a
8 8 hg ci -m "initial" -d "0 0"
9 9 echo foo > .hg/branch
10 10 hg ci -m "add branch name" -d "0 0"
11 11 echo bar > .hg/branch
12 12 hg ci -m "change branch name" -d "0 0"
13 13 rm .hg/branch
14 14 hg ci -m "clear branch name" -d "0 0"
15 15
16 16 hg co foo
17 17 cat .hg/branch
18 18 echo bleah > a
19 19 hg ci -m "modify a branch" -d "0 0"
20 20
21 21 hg merge
22 22 cat .hg/branch
23 23 HG_MERGE=true hg ci -m "merge" -d "0 0"
24 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 1 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 2 foo
3 3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 4 (branch merge, don't forget to commit)
5 5 foo
6 6 changeset: 5:dc140083783b
7 7 branch: foo
8 8 tag: tip
9 9 parent: 4:98d14f698afe
10 10 parent: 3:9d567d0b51f9
11 11 user: test
12 12 date: Thu Jan 01 00:00:00 1970 +0000
13 13 summary: merge
14 14
15 15 changeset: 4:98d14f698afe
16 16 branch: foo
17 17 parent: 1:0079f24813e2
18 18 user: test
19 19 date: Thu Jan 01 00:00:00 1970 +0000
20 20 summary: modify a branch
21 21
22 22 changeset: 3:9d567d0b51f9
23 23 user: test
24 24 date: Thu Jan 01 00:00:00 1970 +0000
25 25 summary: clear branch name
26 26
27 27 changeset: 2:ed2bbf4e0102
28 28 branch: bar
29 29 user: test
30 30 date: Thu Jan 01 00:00:00 1970 +0000
31 31 summary: change branch name
32 32
33 33 changeset: 1:0079f24813e2
34 34 branch: foo
35 35 user: test
36 36 date: Thu Jan 01 00:00:00 1970 +0000
37 37 summary: add branch name
38 38
39 39 changeset: 0:db01e8ea3388
40 40 user: test
41 41 date: Thu Jan 01 00:00:00 1970 +0000
42 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