/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: Robert Collins
  • Date: 2007-11-27 20:35:02 UTC
  • mfrom: (3036 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3038.
  • Revision ID: robertc@robertcollins.net-20071127203502-280mxe1zvdlagrpe
Merge with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
238
238
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
239
239
                           'merge /a --uncommitted -r1 -d b')
240
240
 
 
241
    def test_merge_uncommitted_file(self):
 
242
        """It should be possible to merge changes from a single file."""
 
243
        tree_a = self.make_branch_and_tree('tree_a')
 
244
        tree_a.commit('initial commit')
 
245
        tree_a.bzrdir.sprout('tree_b')
 
246
        self.build_tree(['tree_a/file1', 'tree_a/file2'])
 
247
        tree_a.add(['file1', 'file2'])
 
248
        os.chdir('tree_b')
 
249
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
 
250
        self.failUnlessExists('file1')
 
251
        self.failIfExists('file2')
 
252
 
241
253
    def pullable_branch(self):
242
254
        tree_a = self.make_branch_and_tree('a')
243
255
        self.build_tree(['a/file'])