← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Committer: Robert Collins
Date: 2006-03-09 06:15:24 UTC
mto: (1603.1.1 integration) (1607.1.2 integration) (1615.1.2 bzr.mbp.integration)
mto: This revision was merged to the branch mainline in revision 1601.
Revision ID: robertc@robertcollins.net-20060309061524-74c42a273f335e85

Missing needs a write lock sometimes.

files modified:
bzrlib/builtins.py

Show diffs side-by-side

added added

removed removed

bzrlib/builtins.py

2034

2034

remote_branch = bzrlib.branch.Branch.open(other_branch)

2035

2035

remote_branch.lock_read()

2036

2036

try:

2037

local_branch.lock_read()

2037

local_branch.lock_write()

2038

2038

try:

2039

2039

local_extra, remote_extra = find_unmerged(local_branch, remote_branch)

2040

2040

if (log_format == None):

Older »