[PATCH] push to diverged branch

[Martin Pool]

On  8 Oct 2006, Matthieu Moy <Matthieu.Moy at imag.fr> wrote:
> Matthieu Moy <Matthieu.Moy at imag.fr> writes:
> 
> > John Arbash Meinel <john at arbash-meinel.com> writes:
> >
> >> ' Try using "merge" and then "push".')
> >>
> >> Rather than escaping all the quotes.
> 
> Oups. Forgot the testcases:
> 
> === modified file 'bzrlib/builtins.py'
> --- bzrlib/builtins.py2006-09-27 12:50:58 +0000
> +++ bzrlib/builtins.py2006-10-08 14:32:32 +0000
> @@ -644,8 +644,8 @@
>                  else:
>                      count = tree_to.pull(br_from, overwrite)
>              except DivergedBranches:
> -                raise BzrCommandError("These branches have diverged."
> -                                      "  Try a merge then push with overwrite.")
> +                raise BzrCommandError('These branches have diverged.'
> +                                      '  Try using "merge" and then "push".')
>          note('%d revision(s) pushed.' % (count,))
>  
>          if verbose:
> 
> === modified file 'bzrlib/tests/blackbox/test_push.py'
> --- bzrlib/tests/blackbox/test_push.py2006-07-28 16:05:23 +0000
> +++ bzrlib/tests/blackbox/test_push.py2006-10-08 14:37:25 +0000
> @@ -71,7 +71,7 @@
>          out = self.run_bzr('push', '../branch_b', retcode=3)
>          self.assertEquals(out,
>                  ('','bzr: ERROR: These branches have diverged.  '
> -                    'Try a merge then push with overwrite.\n'))
> +                    'Try using "merge" and then "push".\n'))
>          self.assertEquals(abspath(branch_a.get_push_location()),
>                            abspath(branch_b.bzrdir.root_transport.base))

+1 from me too, I'll merge it.

-- 
Martin