← 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-05 05:35:25 UTC
  • mfrom: (974.1.55)
  • Revision ID: mbp@sourcefrog.net-20050905053525-2112bac069dbe331
- merge various bug fixes from aaron

aaron.bentley@utoronto.ca-20050905020131-a2d5b7711dd6cd98

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
 
199
204
    def readonly_path(self, id):
200
205
        if id not in self.tree:
201
206
            return None
299
304
        merge_inner(this_branch, other_tree, base_tree, tempdir, 
300
305
                    ignore_zero=ignore_zero, backup_files=backup_files, 
301
306
                    merge_type=merge_type, interesting_ids=interesting_ids)
302
 
        if base_is_ancestor and other_rev_id is not None:
 
307
        if base_is_ancestor and other_rev_id is not None\
 
308
            and other_rev_id not in this_branch.revision_history():
303
309
            this_branch.add_pending_merge(other_rev_id)
304
310
    finally:
305
311
        shutil.rmtree(tempdir)