← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-09-01 11:19:08 UTC
  • Revision ID: mbp@sourcefrog.net-20050901111907-ff5ac13ee6fedc85
- split commit message editor functions out into own file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
196
196
            return True
197
197
        return self.tree.inventory.has_id(file_id)
198
198
 
199
 
    def has_or_had_id(self, file_id):
200
 
        if file_id == self.tree.inventory.root.file_id:
201
 
            return True
202
 
        return self.tree.inventory.has_id(file_id)
203
 
 
204
199
    def readonly_path(self, id):
205
200
        if id not in self.tree:
206
201
            return None
304
299
        merge_inner(this_branch, other_tree, base_tree, tempdir, 
305
300
                    ignore_zero=ignore_zero, backup_files=backup_files, 
306
301
                    merge_type=merge_type, interesting_ids=interesting_ids)
307
 
        if base_is_ancestor and other_rev_id is not None\
308
 
            and other_rev_id not in this_branch.revision_history():
 
302
        if base_is_ancestor and other_rev_id is not None:
309
303
            this_branch.add_pending_merge(other_rev_id)
310
304
    finally:
311
305
        shutil.rmtree(tempdir)