Mercurial > hg
comparison tests/test-newbranch.out @ 4209:dbc3846c09a1
Merge with -stable, fix small test failure
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 14 Mar 2007 01:26:09 -0500 |
parents | aee3d312c32e a7af0eeae8a3 |
children | 0d51eb296fb9 |
comparison
equal
deleted
inserted
replaced
4208:bd9b84b9a84b | 4209:dbc3846c09a1 |
---|---|
43 user: test | 43 user: test |
44 date: Mon Jan 12 13:46:40 1970 +0000 | 44 date: Mon Jan 12 13:46:40 1970 +0000 |
45 summary: initial | 45 summary: initial |
46 | 46 |
47 foo 5:5f8fb06e083e | 47 foo 5:5f8fb06e083e |
48 3:bf1bc2f45e83 | 48 default 3:bf1bc2f45e83 |
49 bar 2:67ec16bde7f1 | 49 bar 2:67ec16bde7f1 |
50 foo | 50 foo |
51 | 51 default |
52 bar | 52 bar |
53 % test for invalid branch cache | 53 % test for invalid branch cache |
54 rolling back last transaction | 54 rolling back last transaction |
55 changeset: 4:4909a3732169 | 55 changeset: 4:4909a3732169 |
56 branch: foo | 56 branch: foo |
74 description: | 74 description: |
75 modify a branch | 75 modify a branch |
76 | 76 |
77 | 77 |
78 4:4909a3732169 | 78 4:4909a3732169 |
79 features: unnamed | |
80 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 | 79 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 |
81 bf1bc2f45e834c75404d0ddab57d53beab56e2f8 | 80 bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default |
82 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo | 81 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo |
83 67ec16bde7f1575d523313b9bca000f6a6f12dca bar | 82 67ec16bde7f1575d523313b9bca000f6a6f12dca bar |
84 % test for different branch cache features | |
85 branch cache: no features specified | |
86 foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f | |
87 3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8 | |
88 bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca | |
89 branch cache: unknown features: dummy, foo, bar | |
90 foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f | |
91 3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8 | |
92 bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca | |
93 branch cache: missing features: unnamed | |
94 foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f | |
95 3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8 | |
96 bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca | |
97 % test old hg reading branch cache with feature list | |
98 ValueError raised correctly, good. | |
99 % update with no arguments: tipmost revision of the current branch | 83 % update with no arguments: tipmost revision of the current branch |
100 bf1bc2f45e83 | 84 bf1bc2f45e83 |
101 4909a3732169 (foo) tip | 85 4909a3732169 (foo) tip |