← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branchbuilder.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_branchbuilder.py
26
26
 
27
27
 
28
28
class TestBranchBuilder(tests.TestCaseWithMemoryTransport):
29
 
    
 
29
 
30
30
    def test_create(self):
31
31
        """Test the constructor api."""
32
32
        builder = BranchBuilder(self.get_transport().clone('foo'))
221
221
        self.addCleanup(builder.finish_series)
222
222
        builder.build_snapshot('B-id', ['A-id'],
223
223
            [('modify', ('a-id', 'new\ncontent\n'))])
224
 
        builder.build_snapshot('C-id', ['A-id'], 
 
224
        builder.build_snapshot('C-id', ['A-id'],
225
225
            [('add', ('c', 'c-id', 'file', 'alt\ncontent\n'))])
226
226
        # We should now have a graph:
227
227
        #   A