← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2006-03-23 05:14:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1631.
  • Revision ID: aaron.bentley@utoronto.ca-20060323051403-90fb2a3645c05dd1
Fix uncommit to handle bound branches, and to do locking

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2299
2299
        if location is None:
2300
2300
            location = u'.'
2301
2301
        control, relpath = bzrdir.BzrDir.open_containing(location)
2302
 
        b = control.open_branch()
2303
2302
        try:
2304
2303
            tree = control.open_workingtree()
 
2304
            b = tree.branch
2305
2305
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2306
2306
            tree = None
 
2307
            b = control.open_branch()
2307
2308
 
2308
2309
        if revision is None:
2309
2310
            revno = b.revno()