/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_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-05-27 17:57:23 UTC
  • mfrom: (5929 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5930.
  • Revision ID: v.ladeuil+lp@free.fr-20110527175723-vvm07ydeccenexg9
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
353
353
        self.assertPathExists('file1')
354
354
        self.assertPathDoesNotExist('file2')
355
355
 
 
356
    def test_merge_nonexistent_file(self):
 
357
        """It should not be possible to merge changes from a file which
 
358
        does not exist."""
 
359
        tree_a = self.make_branch_and_tree('tree_a')
 
360
        self.build_tree_contents([('tree_a/file', 'bar\n')])
 
361
        tree_a.add(['file'])
 
362
        tree_a.commit('commit 1')
 
363
        os.chdir('tree_a')
 
364
        self.run_bzr_error(('Path\(s\) do not exist: non/existing',),
 
365
                           ['merge', 'non/existing'])
 
366
 
356
367
    def pullable_branch(self):
357
368
        tree_a = self.make_branch_and_tree('a')
358
369
        self.build_tree_contents([('a/file', 'bar\n')])