/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 breezy/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 12:20:11 UTC
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116122011-40m8t96o0bcy6e16
Fix E127

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
4649
4649
        if (user_location is not None
4650
4650
            and ((remember or
4651
4651
              (remember is None and
4652
 
                   tree.branch.get_submit_branch() is None)))):
 
4652
               tree.branch.get_submit_branch() is None)))):
4653
4653
            tree.branch.set_submit_branch(other_branch.base)
4654
4654
        # Merge tags (but don't set them in the master branch yet, the user
4655
4655
        # might revert this merge).  Commit will propagate them.