Add merge base

dulwich/merge.py

@@ -0,0 +1,25 @@
+#!/usr/bin/python3 -u
+#
+# Copyright (C) 2022-2023 Jelmer Vernooij <jelmer@jelmer.uk>
+# vim: expandtab
+#
+# Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
+# General Public License as public by the Free Software Foundation; version 2.0
+# or (at your option) any later version. You can redistribute it and/or
+# modify it under the terms of either of these two licenses.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# You should have received a copy of the licenses; if not, see
+# <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
+# and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
+# License, Version 2.0.
+#
+
+"""Merging of trees."""
+
+

dulwich/tests/test_merge.py

@@ -0,0 +1,34 @@
+# test_merge.py --- Tests for merge support.
+# Copyright (C) 2022-2023 Jelmer Vernooij <jelmer@jelmer.uk>
+#
+# Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
+# General Public License as public by the Free Software Foundation; version 2.0
+# or (at your option) any later version. You can redistribute it and/or
+# modify it under the terms of either of these two licenses.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# You should have received a copy of the licenses; if not, see
+# <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
+# and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
+# License, Version 2.0.
+#
+
+"""Tests for merge support."""
+
+from dulwich.tests import TestCase
+
+
+class MergeTests(TestCase):
+    """Tests for merge support."""
+
+    def scenario(self, base, this, other):
+        # Create a tree with a file called "foo" and base as contents
+        repo = self.make_repo_and_tree("foo", base)
+
+
+    def test_simple(self):

pyproject.toml

@@ -41,6 +41,7 @@ fastimport = ["fastimport"]
 https = ["urllib3>=1.24.1"]
 pgp = ["gpg"]
 paramiko = ["paramiko"]
+merge = ["merge3"]
 
 [project.scripts]
 dulwich = "dulwich.cli:main"