/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/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/test_merge.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
81
81
        self.assertEqual([tip], wt2.get_parent_ids())
82
82
        
83
83
    def test_pending_with_null(self):
84
 
        """When base is forced to revno 0, pending_merges is set"""
 
84
        """When base is forced to revno 0, parent_ids are set"""
85
85
        wt2 = self.test_unrelated()
86
86
        wt1 = WorkingTree.open('.')
87
87
        br1 = wt1.branch
136
136
        log = StringIO()
137
137
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
138
138
                    this_tree=tree_b, ignore_zero=True)
139
 
        log = self._get_log()
 
139
        log = self._get_log(keep_log_file=True)
140
140
        self.failUnless('All changes applied successfully.\n' not in log)
141
141
        tree_b.revert([])
142
142
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
143
143
                    this_tree=tree_b, ignore_zero=False)
144
 
        log = self._get_log()
 
144
        log = self._get_log(keep_log_file=True)
145
145
        self.failUnless('All changes applied successfully.\n' in log)
146
146
 
147
147
    def test_merge_inner_conflicts(self):