← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
123
123
                       rev_id, branch.repository.get_ancestry(rev_id))
124
124
                result = sorted(branch.repository.get_ancestry(rev_id))
125
125
                self.assertEquals(result, [None] + sorted(anc))
126
 
    
 
126
 
127
127
 
128
128
class TestIntermediateRevisions(TestCaseWithTransport):
129
129