~bzr/bzr/bzr.1.5

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-11 00:23:23 UTC
  • mfrom: (2070 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20061011002323-82ba88c293d7caff
[merge] bzr.dev 2070

Show diffs side-by-side

added added

removed removed

Lines of Context:
645
645
                else:
646
646
                    count = tree_to.pull(br_from, overwrite)
647
647
            except errors.DivergedBranches:
648
 
                raise errors.BzrCommandError("These branches have diverged."
649
 
                                             "  Try a merge then push with overwrite.")
 
648
                raise errors.BzrCommandError('These branches have diverged.'
 
649
                                        '  Try using "merge" and then "push".')
650
650
        note('%d revision(s) pushed.' % (count,))
651
651
 
652
652
        if verbose: