[PATCH] push to diverged branch

[Matthieu Moy]

John Arbash Meinel <john at arbash-meinel.com> writes:

> ' Try using "merge" and then "push".')
>
> Rather than escaping all the quotes.

--- bzrlib/builtins.py	2006-09-27 12:50:58 +0000
+++ bzrlib/builtins.py	2006-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:



then.

-- 
Matthieu