/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 send.py

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
send.py
30
30
    revision as _mod_revision,
31
31
    )
32
32
 
33
 
from bzrlib.merge_directive import BaseMergeDirective
 
33
try:
 
34
    from bzrlib.merge_directive import BaseMergeDirective
 
35
except ImportError:
 
36
    from bzrlib.merge_directive import (
 
37
        _BaseMergeDirective as BaseMergeDirective,
 
38
        )
34
39
 
35
40
from bzrlib.plugins.git import (
36
41
    version_info as bzr_git_version_info,