← 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: 2010-09-29 22:03:03 UTC
  • mfrom: (5416.2.6 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100929220303-cr95h8iwtggco721
(mbp) Add 'break-lock --force'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1522
1522
     * an open routine.
1523
1523
 
1524
1524
    Formats are placed in an dict by their format string for reference
1525
 
    during branch opening. Its not required that these be instances, they
 
1525
    during branch opening. It's not required that these be instances, they
1526
1526
    can be classes themselves with class methods - it simply depends on
1527
1527
    whether state is needed for a given format or not.
1528
1528
 
1819
1819
            "with a bzrlib.branch.PullResult object and only runs in the "
1820
1820
            "bzr client.", (0, 15), None))
1821
1821
        self.create_hook(HookPoint('pre_commit',
1822
 
            "Called after a commit is calculated but before it is is "
 
1822
            "Called after a commit is calculated but before it is "
1823
1823
            "completed. pre_commit is called with (local, master, old_revno, "
1824
1824
            "old_revid, future_revno, future_revid, tree_delta, future_tree"
1825
1825
            "). old_revid is NULL_REVISION for the first commit to a branch, "
3480
3480
                # push into the master from the source branch.
3481
3481
                self.source._basic_push(master_branch, overwrite, stop_revision)
3482
3482
                # and push into the target branch from the source. Note that we
3483
 
                # push from the source branch again, because its considered the
 
3483
                # push from the source branch again, because it's considered the
3484
3484
                # highest bandwidth repository.
3485
3485
                result = self.source._basic_push(self.target, overwrite,
3486
3486
                    stop_revision)