/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2010-11-04 17:48:47 UTC
  • mto: This revision was merged to the branch mainline in revision 5523.
  • Revision ID: v.ladeuil+lp@free.fr-20101104174847-x3io00xsknnikaka
https://launchpad.net/bugs/670851
Handle --directory when paths are also provided to shelve and restore.

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')