← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_conflicts.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-11-05 08:35:39 UTC
  • mfrom: (5521.1.2 670851-directory-and-files)
  • Revision ID: pqm@pqm.ubuntu.com-20101105083539-urkk2to9qakthagn
(vila) Respect --directory when path parameters are also used for shelve and
 restore (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
103
103
        self.assertEqual(True, conflicts.is_empty(),
104
104
                         "tree still contains conflicts: %r" % conflicts)
105
105
 
 
106
    def test_resolve_via_directory(self):
 
107
        """resolve when run from subdirectory should handle relative paths"""
 
108
        self.build_tree(["a/subdir/"])
 
109
        self.run_bzr("resolve -d a/subdir ../myfile")
 
110
 
106
111
    def test_auto_resolve(self):
107
112
        """Text conflicts can be resolved automatically"""
108
113
        tree = self.make_branch_and_tree('tree')