← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Robert Collins
  • Date: 2006-01-18 03:09:39 UTC
  • mto: (1534.1.15 integration)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: robertc@robertcollins.net-20060118030939-c5c7106140cf444f
Tweak storage towards mergability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
602
602
            branch = Branch.open(to_location)
603
603
            if name:
604
604
                name = StringIO(name)
605
 
                branch.lock_write()
606
 
                try:
607
 
                    branch.control_files.put_utf8('branch-name', name)
608
 
                finally:
609
 
                    branch.unlock()
610
 
                    
 
605
                branch.control_files.put_utf8('branch-name', name)
 
606
 
611
607
            note('Branched %d revision(s).' % branch.revno())
612
608
        finally:
613
609
            br_from.unlock()
1775
1771
        from bzrlib.branch import Branch
1776
1772
        from_b = Branch.open(from_branch)
1777
1773
        to_b = Branch.open(to_branch)
1778
 
        from_b.lock_read()
1779
 
        try:
1780
 
            to_b.lock_write()
1781
 
            try:
1782
 
                Fetcher(to_b, from_b)
1783
 
            finally:
1784
 
                to_b.unlock()
1785
 
        finally:
1786
 
            from_b.unlock()
 
1774
        Fetcher(to_b, from_b)
1787
1775
 
1788
1776
 
1789
1777
class cmd_missing(Command):