← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-15 14:21:33 UTC
  • mto: This revision was merged to the branch mainline in revision 6143.
  • Revision ID: jriddell@canonical.com-20110915142133-plzged5644llay48
make the test suite pass

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
468
468
                self.master_branch.tags)
469
469
            if tag_conflicts:
470
470
                warning_lines = ['    ' + name for name, _, _ in tag_conflicts]
471
 
                note( gettext("Conflicting tags in bound branch:\n{0}\n".format(
472
 
                    join(warning_lines))) )
 
471
                note( gettext("Conflicting tags in bound branch:\n{0}".format(
 
472
                    "\n".join(warning_lines))) )
473
473
 
474
474
        # Make the working tree be up to date with the branch. This
475
475
        # includes automatic changes scheduled to be made to the tree, such