/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-07-09 15:18:57 UTC
  • mto: This revision was merged to the branch mainline in revision 4535.
  • Revision ID: john@arbash-meinel.com-20090709151857-0halwp51u1on5p1n
'bzr switch -b' can now be used to create the branch while you switch to it.

This is just a convenience thing, but it shortens:
  bzr branch . ../new-branch
  bzr switch ../new-branch
into a single:
  bzr switch -b ../new-branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ancestry.py
43
43
 
44
44
    def _check_ancestry(self, location='', result=None):
45
45
        out = self.run_bzr(['ancestry', location])[0]
46
 
        if result is not None:
47
 
            self.assertEqualDiff(result, out)
48
 
        else:
49
 
            # A2 and B1 can be in either order, because they are parallel, and
50
 
            # thus their topological order is not defined
 
46
        if result is None:
51
47
            result = "A1\nB1\nA2\nA3\n"
52
 
            if result != out:
53
 
                result = "A1\nA2\nB1\nA3\n"
54
 
            self.assertEqualDiff(result, out)
 
48
        self.assertEqualDiff(out, result)
55
49
 
56
50
    def test_ancestry(self):
57
51
        """Tests 'ancestry' command"""