/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: 2006-11-17 04:06:03 UTC
  • mfrom: (2139 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2162.
  • Revision ID: aaron.bentley@utoronto.ca-20061117040603-pgebxndswvwk26tt
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
85
85
        self.assertTrue("Not a branch" in err)
86
86
        self.runbzr('merge -r revno:%d:./..revno:%d:../b'
87
87
                    %(ancestor,b.revno()))
88
 
        self.assertEquals(a.pending_merges(), [b.last_revision()])
 
88
        self.assertEquals(a.get_parent_ids(), 
 
89
                          [a.branch.last_revision(), b.last_revision()])
89
90
        self.check_file_contents('goodbye', 'quux')
90
91
        self.runbzr('revert --no-backup')
91
92
        self.runbzr('merge -r revno:%d:../b'%b.revno())
92
 
        self.assertEquals(a.pending_merges(),
93
 
                          [b.last_revision()])
 
93
        self.assertEquals(a.get_parent_ids(),
 
94
                          [a.branch.last_revision(), b.last_revision()])
94
95
        a_tip = a.commit('merged')
95
96
        self.runbzr('merge ../b -r last:1')
96
97
        self.assertEqual([a_tip], a.get_parent_ids())