← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/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_branch/test_pull.py
16
16
 
17
17
"""Tests for branch.pull behaviour."""
18
18
 
19
 
import os
20
 
 
21
19
from bzrlib import (
22
20
    branch,
23
21
    bzrdir,
117
115
        self.assertEqual('P1', result.old_revid)
118
116
        self.assertEqual(2, result.new_revno)
119
117
        self.assertEqual('M1', result.new_revid)
120
 
        self.assertEqual(None, result.tag_conflicts)
 
118
        self.assertEqual([], result.tag_conflicts)
121
119
 
122
120
    def test_pull_overwrite(self):
123
121
        tree_a = self.make_branch_and_tree('tree_a')