← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-06-08 05:00:01 UTC
  • mto: (4441.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 4443.
  • Revision ID: nmb@wartburg.edu-20090608050001-7znk3433urf3bf0p
Fix 269477 Add documentation about diverged branches and refer to it when pushing fails

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
128
128
                remember)
129
129
        except errors.DivergedBranches:
130
130
            raise errors.BzrCommandError('These branches have diverged.'
131
 
                                    '  Try using "merge" and then "push".')
 
131
                                    '  See "bzr help diverged-branches"'
 
132
                                    ' for more information.')
132
133
        except errors.NoRepositoryPresent:
133
134
            # we have a bzrdir but no branch or repository
134
135
            # XXX: Figure out what to do other than complain.