← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Gary van der Merwe
  • Date: 2010-11-18 08:18:19 UTC
  • mto: This revision was merged to the branch mainline in revision 5543.
  • Revision ID: garyvdm@gmail.com-20101118081819-5bb84wrcl5gim8hb
Update test to match BranchBuilder change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1280
1280
        builder = self.get_builder()
1281
1281
        builder.build_snapshot('A-id', None,
1282
1282
            [('add', ('', None, 'directory', None))])
1283
 
        builder.build_snapshot('B-id', [_mod_revision.NULL_REVISION],
 
1283
        builder.build_snapshot('B-id', [],
1284
1284
            [('add', ('', None, 'directory', None))])
1285
1285
        builder.build_snapshot('D-id', ['A-id', 'B-id'], [])
1286
1286
        builder.build_snapshot('C-id', ['A-id', 'B-id'], [])