← 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: Andrew Bennetts
  • Date: 2011-07-11 02:06:18 UTC
  • mfrom: (6018 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6020.
  • Revision ID: andrew.bennetts@canonical.com-20110711020618-gcjgoeb5azwjrnu6
Merge lp:bzr/2.4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1902
1902
        builder.build_snapshot('C-id', ['A-id'], [])
1903
1903
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1904
1904
            [('unversion', 'a-id'),
 
1905
             ('flush', None),
1905
1906
             ('add', (u'a', 'a-id', 'directory', None))])
1906
1907
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1907
1908
        merge_obj = self.make_merge_obj(builder, 'E-id')
1925
1926
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1926
1927
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1927
1928
            [('unversion', 'a-id'),
 
1929
             ('flush', None),
1928
1930
             ('add', (u'a', 'a-id', 'directory', None))])
1929
1931
        merge_obj = self.make_merge_obj(builder, 'E-id')
1930
1932
        entries = list(merge_obj._entries_lca())