/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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2831
2831
                merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2832
2832
                    pb)
2833
2833
                allow_pending = False
 
2834
                if other_path != '':
 
2835
                    merger.interesting_files = [other_path]
2834
2836
 
2835
2837
            if merger is None:
2836
2838
                merger, allow_pending = self._get_merger_from_branch(tree,
3694
3696
        from bzrlib.smart import medium, server
3695
3697
        from bzrlib.transport import get_transport
3696
3698
        from bzrlib.transport.chroot import ChrootServer
3697
 
        from bzrlib.transport.remote import BZR_DEFAULT_PORT, BZR_DEFAULT_INTERFACE
3698
3699
        if directory is None:
3699
3700
            directory = os.getcwd()
3700
3701
        url = urlutils.local_path_to_url(directory)
3707
3708
            smart_server = medium.SmartServerPipeStreamMedium(
3708
3709
                sys.stdin, sys.stdout, t)
3709
3710
        else:
3710
 
            host = BZR_DEFAULT_INTERFACE
 
3711
            host = medium.BZR_DEFAULT_INTERFACE
3711
3712
            if port is None:
3712
 
                port = BZR_DEFAULT_PORT
 
3713
                port = medium.BZR_DEFAULT_PORT
3713
3714
            else:
3714
3715
                if ':' in port:
3715
3716
                    host, port = port.split(':')