← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-31 00:43:21 UTC
  • mfrom: (1551.2.51 win32fixes)
  • Revision ID: pqm@pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
Various fixes for win32

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2043
2043
                raise BzrCommandError("No missing location known or specified.")
2044
2044
            print "Using last location: " + local_branch.get_parent()
2045
2045
        remote_branch = bzrlib.branch.Branch.open(other_branch)
2046
 
        remote_branch.lock_read()
 
2046
        local_branch.lock_write()
 
2047
        if remote_branch.base == local_branch.base:
 
2048
            remote_branch = local_branch
2047
2049
        try:
2048
 
            local_branch.lock_write()
 
2050
            remote_branch.lock_read()
2049
2051
            try:
2050
2052
                local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2051
2053
                if (log_format == None):