Merge lp:~jelmer/brz/rewrite-escape into lp:brz

[Jelmer Vernooij]

Fix invalid escape sequence errors in rebase plugin on Python 3.

Fix invalid escape sequence errors on Python 3.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/643/

=== modified file 'breezy/plugins/rewrite/tests/test_rebase.py'
--- breezy/plugins/rewrite/tests/test_rebase.py	2020-01-11 17:20:34 +0000
+++ breezy/plugins/rewrite/tests/test_rebase.py	2020-01-23 03:25:39 +0000
@@ -209,7 +209,7 @@
                 ["bla", "bloe"]), {"bloe": "lala"}, graph, lambda y, _: "new" + y))
 
     def test_plan_with_already_merged(self):
-        """We need to use a merge base that makes sense.
+        r"""We need to use a merge base that makes sense.
 
         A
         | \
@@ -240,7 +240,7 @@
                 ["D", "E"], "D", None, "C", graph, lambda y, _: y + "'"))
 
     def test_plan_with_already_merged_skip_merges(self):
-        """We need to use a merge base that makes sense.
+        r"""We need to use a merge base that makes sense.
 
         A
         | \
@@ -593,7 +593,7 @@
         self.assertEquals(oldrev.timezone, newrev.timezone)
 
     def test_already_merged(self):
-        """We need to use a merge base that makes sense.
+        r"""We need to use a merge base that makes sense.
 
         A
         | \