/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: Aaron Bentley
  • Date: 2007-09-05 04:35:21 UTC
  • mto: This revision was merged to the branch mainline in revision 2797.
  • Revision ID: aaron.bentley@utoronto.ca-20070905043521-zrfpj4523s67t2a4
Fix up various test cases

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
67
67
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
68
68
                    retcode=3)
69
69
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')
70
 
        a_tree.revert([], backups=False)
 
70
        a_tree.revert(backups=False)
71
71
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
72
 
        a_tree.revert([], backups=False)
 
72
        a_tree.revert(backups=False)
73
73
        self.run_bzr_error(['Show-base is not supported for this merge type'],
74
74
                           'merge ../b -r last:1..last:1 --merge-type weave'
75
75
                           ' --show-base')
76
 
        a_tree.revert([], backups=False)
 
76
        a_tree.revert(backups=False)
77
77
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
78
 
        a_tree.revert([], backups=False)
 
78
        a_tree.revert(backups=False)
79
79
        self.run_bzr('merge ../b -r last:1')
80
80
        self.check_file_contents('goodbye', 'quux')
81
81
        # Merging a branch pulls its revision into the tree
83
83
        b_tip = b.last_revision()
84
84
        self.failUnless(a.branch.repository.has_revision(b_tip))
85
85
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
86
 
        a_tree.revert([], backups=False)
 
86
        a_tree.revert(backups=False)
87
87
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
88
88
        self.assertTrue("Not a branch" in err)
89
89
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
91
91
        self.assertEquals(a.get_parent_ids(), 
92
92
                          [a.branch.last_revision(), b.last_revision()])
93
93
        self.check_file_contents('goodbye', 'quux')
94
 
        a_tree.revert([], backups=False)
 
94
        a_tree.revert(backups=False)
95
95
        self.run_bzr('merge -r revno:%d:../b'%b.revno())
96
96
        self.assertEquals(a.get_parent_ids(),
97
97
                          [a.branch.last_revision(), b.last_revision()])