← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-20 18:25:38 UTC
  • mto: (1185.50.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1518.
  • Revision ID: john@arbash-meinel.com-20051120182538-35c3c84165a794c7
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1170
1170
        """See Branch.pull."""
1171
1171
        source.lock_read()
1172
1172
        try:
 
1173
            old_history = self.revision_history()
1173
1174
            try:
1174
1175
                self.update_revisions(source)
1175
1176
            except DivergedBranches:
1176
1177
                if not overwrite:
1177
1178
                    raise
1178
1179
                self.set_revision_history(source.revision_history())
 
1180
            new_history = self.revision_history()
1179
1181
        finally:
1180
1182
            source.unlock()
1181
1183