1
# -*- coding: utf-8 -*-
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.
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.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from bzrlib.tests import TestCaseInTempDir
19
from bzrlib.branch import Branch
20
from bzrlib.builtins import merge
22
class TestAncestry(TestCaseInTempDir):
24
def test_ancestry(self):
25
"""Tests 'ancestry' command"""
27
a = Branch.initialize('A')
28
a_wt = a.working_tree()
29
open('A/foo', 'wb').write('1111\n')
31
a_wt.commit('added foo',rev_id='A1')
34
b_wt = b.working_tree()
35
open('B/foo','wb').write('1111\n22\n')
36
b_wt.commit('modified B/foo',rev_id='B1')
37
open('A/foo', 'wb').write('000\n1111\n')
38
a_wt.commit('modified A/foo',rev_id='A2')
39
merge(['B',-1],['B',1],this_dir='A')
40
a_wt.commit('merged B into A',rev_id='A3')
41
self.run_bzr('ancestry')
added
removed
bzrlib/tests/blackbox/test_ancestry.py
