← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/test_pull.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_pull.py
99
99
        self.assertEqual('P1', result.old_revid)
100
100
        self.assertEqual(2, result.new_revno)
101
101
        self.assertEqual('M1', result.new_revid)
102
 
        self.assertEqual(None, result.tag_conflicts)
 
102
        self.assertEqual([], result.tag_conflicts)
103
103
 
104
104
    def test_pull_overwrite(self):
105
105
        tree_a = self.make_from_branch_and_tree('tree_a')