← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2010-04-01 04:41:18 UTC
  • mto: This revision was merged to the branch mainline in revision 5128.
  • Revision ID: mbp@sourcefrog.net-20100401044118-shyctqc02ob08ngz
ignore .testrepository

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_commit.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
168
168
        tree_a.commit('change n in A')
169
169
 
170
170
        # Merging from A should introduce conflicts because 'n' was modified
171
 
        # (in A) and removed (in B), so 'a' needs to be restored.
 
171
        # and removed, so 'a' needs to be restored.
172
172
        num_conflicts = tree_b.merge_from_branch(tree_a.branch)
173
173
        self.assertEqual(3, num_conflicts)
174
174
        paths = [(path, ie.file_id)