/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

  • Committer: Lukáš Lalinský
  • Date: 2009-08-11 18:00:37 UTC
  • mto: (4633.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4634.
  • Revision ID: lalinsky@gmail.com-20090811180037-gc8bbk2xumfc81g0
Add tests for various situations

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1189
1189
            use_existing_dir=False, switch=False):
1190
1190
        from bzrlib import switch as _mod_switch
1191
1191
        from bzrlib.tag import _merge_tags_if_possible
1192
 
        if switch:
1193
 
            # Check if we have a WT in the current directory
1194
 
            wt, _ = WorkingTree.open_containing('.')
1195
1192
        accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1196
1193
            from_location)
1197
1194
        if (accelerator_tree is not None and
1253
1250
                note('Branched %d revision(s).' % branch.revno())
1254
1251
            if switch:
1255
1252
                # Switch to the new branch
 
1253
                wt, _ = WorkingTree.open_containing('.')
1256
1254
                _mod_switch.switch(wt.bzrdir, branch)
1257
1255
                note('Switched to branch: %s',
1258
1256
                    urlutils.unescape_for_display(branch.base, 'utf-8'))