← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2010-11-24 16:01:57 UTC
  • mfrom: (4597.13.7 cleanup)
  • mto: This revision was merged to the branch mainline in revision 5558.
  • Revision ID: v.ladeuil+lp@free.fr-20101124160157-kieuslo7wj9abdmb
Merge cleanup into 638451-malformed

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4028
4028
        if ((remember or tree.branch.get_submit_branch() is None) and
4029
4029
             user_location is not None):
4030
4030
            tree.branch.set_submit_branch(other_branch.base)
4031
 
        _merge_tags_if_possible(other_branch, tree.branch)
 
4031
        # Merge tags (but don't set them in the master branch yet, the user
 
4032
        # might revert this merge).  Commit will propagate them.
 
4033
        _merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
4032
4034
        merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4033
4035
            other_revision_id, base_revision_id, other_branch, base_branch)
4034
4036
        if other_path != '':