|
5557.1.15
by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt |
1 |
# Copyright (C) 2005-2009, 2011 Canonical Ltd
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
16 |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
17 |
|
|
5972.3.15
by Jelmer Vernooij
Use matchers. |
18 |
from bzrlib.branchbuilder import BranchBuilder |
|
1986.4.4
by Robert Collins
Merge from TestCaseWithMemoryTransport. |
19 |
from bzrlib.tests import TestCaseWithMemoryTransport |
|
5972.3.15
by Jelmer Vernooij
Use matchers. |
20 |
from bzrlib.tests.matchers import MatchesAncestry |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
21 |
|
22 |
||
|
1986.4.4
by Robert Collins
Merge from TestCaseWithMemoryTransport. |
23 |
class TestAncestry(TestCaseWithMemoryTransport): |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
24 |
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
25 |
def test_straightline_ancestry(self): |
26 |
"""Test ancestry file when just committing."""
|
|
|
2466.10.1
by Robert Collins
Use BranchBuilder in test_ancestry. |
27 |
builder = BranchBuilder(self.get_transport()) |
28 |
rev_id_one = builder.build_commit() |
|
29 |
rev_id_two = builder.build_commit() |
|
30 |
branch = builder.get_branch() |
|
|
5972.3.15
by Jelmer Vernooij
Use matchers. |
31 |
self.assertThat([rev_id_one, rev_id_two], |
32 |
MatchesAncestry(branch.repository, rev_id_two)) |
|
33 |
self.assertThat([rev_id_one], |
|
34 |
MatchesAncestry(branch.repository, rev_id_one)) |
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
35 |
|
36 |
# TODO: check that ancestry is updated to include indirectly merged revisions
|