← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2005-10-27 19:45:18 UTC
  • mfrom: (1185.16.130)
  • Revision ID: robertc@robertcollins.net-20051027194518-58afabc9ab280bb0
Merge from Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
330
330
                yield stem
331
331
 
332
332
    @needs_write_lock
333
 
    def pull(self, source, remember=False, clobber=False):
 
333
    def pull(self, source, remember=False, overwrite=False):
334
334
        from bzrlib.merge import merge_inner
335
335
        source.lock_read()
336
336
        try:
338
338
            try:
339
339
                self.branch.update_revisions(source)
340
340
            except DivergedBranches:
341
 
                if not clobber:
 
341
                if not overwrite:
342
342
                    raise
343
343
                self.branch.set_revision_history(source.revision_history())
344
344
            new_revision_history = self.branch.revision_history()