From 63aa563055ad06854aa345c8d0c904926b42efc5 Mon Sep 17 00:00:00 2001
From: Oliver Boehmer <olI@spine.de>
Date: Sun, 7 May 2023 06:43:02 +0200
Subject: [PATCH 1/2] replace _add_initial() by update()

---
 src/pabot/result_merger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pabot/result_merger.py b/src/pabot/result_merger.py
index 169d7a76..e7ab827d 100644
--- a/src/pabot/result_merger.py
+++ b/src/pabot/result_merger.py
@@ -56,7 +56,7 @@ def merge(self, merged):
         try:
             self._set_prefix(merged.source)
             merged.suite.visit(self)
-            self.root.metadata._add_initial(merged.suite.metadata)
+            self.root.metadata.update(merged.suite.metadata)
             if self.errors != merged.errors:
                 self.errors.add(merged.errors)
         except:

From 6ae1d0eb157253346e9c2f3aafa13fedeac07323 Mon Sep 17 00:00:00 2001
From: Oliver Boehmer <olI@spine.de>
Date: Sun, 7 May 2023 06:43:15 +0200
Subject: [PATCH 2/2] cater for new "parser" robot option

---
 src/pabot/pabot.py  | 1 +
 tests/test_pabot.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/pabot/pabot.py b/src/pabot/pabot.py
index c174b359..8738db20 100644
--- a/src/pabot/pabot.py
+++ b/src/pabot/pabot.py
@@ -1258,6 +1258,7 @@ def _options_for_rebot(options, start_time_string, end_time_string):
         "maxassignlength",
         "maxerrorlines",
         "monitorcolors",
+        "parser",
         "prerunmodifier",
         "quiet",
         "randomize",
diff --git a/tests/test_pabot.py b/tests/test_pabot.py
index 703f7a9f..c60c7439 100644
--- a/tests/test_pabot.py
+++ b/tests/test_pabot.py
@@ -1045,6 +1045,7 @@ def test_rebot_conf(self):
                 "prerunmodifier",
                 "monitorcolors",
                 "language",
+                "parser",
             ]:
                 self.assertFalse(key in options, "%s should not be in options" % key)
             else: