← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
239
239
        tree_b.revert([])
240
240
        self.run_bzr_error(('Cannot use --uncommitted and --revision',), 
241
241
                           'merge', '../a', '--uncommitted', '-r1')
 
242
 
 
243
    def pullable_branch(self):
 
244
        os.mkdir('a')
 
245
        os.chdir('a')
 
246
        self.example_branch()
 
247
        os.chdir('..')
 
248
        self.runbzr('branch a b')
 
249
        os.chdir('b')
 
250
        file('goodbye', 'wt').write('quux')
 
251
        self.runbzr(['commit', '-m', "mode u's are always good"])
 
252
        os.chdir('../a')
 
253
 
 
254
    def pullable_branch(self):
 
255
        tree_a = self.make_branch_and_tree('a')
 
256
        self.build_tree(['a/file'])
 
257
        tree_a.add(['file'])
 
258
        self.id1 = tree_a.commit('commit 1')
 
259
        
 
260
        tree_b = self.make_branch_and_tree('b')
 
261
        tree_b.pull(tree_a.branch)
 
262
        file('b/file', 'wb').write('foo')
 
263
        self.id2 = tree_b.commit('commit 2')
 
264
 
 
265
    def test_merge_pull(self):
 
266
        self.pullable_branch()
 
267
        os.chdir('a')
 
268
        (out, err) = self.run_bzr('merge', '--pull', '../b')
 
269
        self.assertContainsRe(err, '1 revision\\(s\\) pulled')
 
270
        tree_a = WorkingTree.open('.')
 
271
        self.assertEqual([self.id2], tree_a.get_parent_ids())