← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Robert Collins
  • Date: 2005-10-18 06:56:24 UTC
  • mfrom: (0.2.1)
  • mto: This revision was merged to the branch mainline in revision 1463.
  • Revision ID: robertc@robertcollins.net-20051018065624-e92ff4e7ab3175bb
'bzr pull' now accepts '--clobber'.

This will discard local changes and make this branch identical to the source
branch. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
676
676
            mutter("add {%s} to revision-history" % revision_id)
677
677
        rev_history = self.revision_history()
678
678
        rev_history.extend(revision_ids)
 
679
        self.set_revision_history(rev_history)
 
680
 
 
681
    @needs_write_lock
 
682
    def set_revision_history(self, rev_history):
679
683
        self.put_controlfile('revision-history', '\n'.join(rev_history))
680
684
 
681
685
    def has_revision(self, revision_id):