← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-09-11 01:03:53 UTC
  • mfrom: (2810.1.1 tag-overwrite)
  • Revision ID: pqm@pqm.ubuntu.com-20070911010353-6lu7ek40rbjhj86o
(lukas) Overwrite conflicting tags by push|pull --overwrite

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1485
1485
                if stop_revision is None:
1486
1486
                    stop_revision = source.last_revision()
1487
1487
                self.generate_revision_history(stop_revision)
1488
 
            result.tag_conflicts = source.tags.merge_to(self.tags)
 
1488
            result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
1489
1489
            result.new_revno, result.new_revid = self.last_revision_info()
1490
1490
            if _hook_master:
1491
1491
                result.master_branch = _hook_master
1594
1594
                raise
1595
1595
        if overwrite:
1596
1596
            target.set_revision_history(self.revision_history())
1597
 
        result.tag_conflicts = self.tags.merge_to(target.tags)
 
1597
        result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
1598
1598
        result.new_revno, result.new_revid = target.last_revision_info()
1599
1599
        return result
1600
1600