~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_ancestry.py

• browse files at revision 1685.1.73
• compare with another revision
• download diff
• download tarball
• view history from revision 1685.1.73

• reverse the comparison (1685.1.73 to 1226)
• stop comparing with revision 1226

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_ancestry.py

 

1

# -*- coding: utf-8 -*-

 

2

 

 

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.

 

7

 

 

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.

 

12

 

 

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

 

16

 

 

17

import os

 

18

 

 

19

from bzrlib.builtins import merge

 

20

from bzrlib.tests import TestCaseWithTransport

 

21

from bzrlib.workingtree import WorkingTree

 

22

 

 

23

 

 

24

class TestAncestry(TestCaseWithTransport):

 

25

 

 

26

    def test_ancestry(self):

 

27

        """Tests 'ancestry' command"""

 

28

        a_wt = self.make_branch_and_tree('A')

 

29

        open('A/foo', 'wb').write('1111\n')

 

30

        a_wt.add('foo')

 

31

        a_wt.commit('added foo',rev_id='A1')

 

32

        self.run_bzr_captured(['branch', 'A', 'B'])

 

33

        b_wt = WorkingTree.open('B')

 

34

        open('B/foo','wb').write('1111\n22\n')

 

35

        b_wt.commit('modified B/foo',rev_id='B1')

 

36

        open('A/foo', 'wb').write('000\n1111\n')

 

37

        a_wt.commit('modified A/foo',rev_id='A2')

 

38

        merge(['B',-1],['B',1],this_dir='A')

 

39

        a_wt.commit('merged B into A',rev_id='A3')

 

40

        os.chdir('A')

 

41

        out, err = self.run_bzr('ancestry')

 

42

        self.assertEquals(err, '')

 

43

        self.assertEqualDiff(out,

 

44

"""A1

 

45

B1

 

46

A2

 

47

A3

 

48

""")

 

49

 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1