← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2006-05-17 07:09:13 UTC
  • mfrom: (1668.1.15 bzr-0.8.mbp)
  • mto: This revision was merged to the branch mainline in revision 1710.
  • Revision ID: mbp@sourcefrog.net-20060517070913-723e387ac91d55c0
merge 0.8 fix branch, including register-branch plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ancestry.py
37
37
        a_wt.commit('modified A/foo',rev_id='A2')
38
38
        merge(['B',-1],['B',1],this_dir='A')
39
39
        a_wt.commit('merged B into A',rev_id='A3')
40
 
        self.run_bzr('ancestry')
 
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