PyPI - half-orm-dev - Versions diffs - 1.0.0a16__tar.gz → 1.0.0a17__tar.gz - Mend

@@ -2586,7 +2586,34 @@ class ReleaseManager:
                 # snapshot changes (which delete the TOML), we commit everything as
                 # a single merge commit with no conflict.
                 self._repo.hgit.checkout("ho-prod")
-                self._repo.hgit.merge(release_branch, no_commit=True)
+                try:
+                    self._repo.hgit.merge(release_branch, no_commit=True)
+                except GitCommandError:
+                    # ho_baseclasses.py is auto-generated and may conflict when the
+                    # file was introduced by a half_orm_dev migration AFTER the release
+                    # branch was cut (CONFLICT add/add).  The release branch always
+                    # holds the correct post-patch version, so we take --theirs.
+                    git_repo = self._repo.hgit._HGit__git_repo
+                    conflicted = git_repo.git.diff(
+                        '--name-only', '--diff-filter=U'
+                    ).splitlines()
+                    package = self._repo.name
+                    auto_generated = {f'{package}/ho_baseclasses.py'}
+                    unexpected = set(conflicted) - auto_generated
+                    if unexpected:
+                        raise ReleaseManagerError(
+                            f"Merge conflict(s) in non-auto-generated file(s): "
+                            + ', '.join(sorted(unexpected))
+                        )
+                    if not conflicted:
+                        raise  # no conflicted files listed — unexpected state
+                    for path in conflicted:
+                        git_repo.git.checkout('--theirs', path)
+                        git_repo.git.add(path)
+                    click.echo(
+                        f"  ℹ Resolved add/add conflict in {', '.join(conflicted)} "
+                        f"(took release branch version)"
+                    )
                 # 10. Generate schema dump and apply snapshot changes in merge window
                 self._repo.database._generate_schema_sql(version, model_dir)

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a16
+Version: 1.0.0a17
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a16
+Version: 1.0.0a17
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

	@@ -0,0 +1 @@
1	+ 1.0.0-a17

	@@ -1 +0,0 @@
1	- 1.0.0-a16

half-orm-dev 1.0.0a16__tar.gz → 1.0.0a17__tar.gz

half-orm-dev 1.0.0a16tar.gz → 1.0.0a17tar.gz