/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Made bzr missing . work on win32

Show diffs side-by-side

added added

removed removed

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