← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_pull.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
from cStringIO import StringIO
19
19
import os
21
21
from bzrlib import errors
22
22
from bzrlib.errors import NotBranchError, NotVersionedError
23
23
from bzrlib.osutils import basename
24
 
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
 
24
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
25
25
from bzrlib.trace import mutter
26
26
from bzrlib.transport import get_transport
27
27
 
35
35
        tree.commit('foo', rev_id='A')
36
36
        tree_b = self.make_branch_and_tree('to')
37
37
        return tree, tree_b
38
 
 
 
38
 
39
39
    def test_pull(self):
40
40
        tree_a, tree_b = self.get_pullable_trees()
41
41
        tree_b.pull(tree_a.branch)