patch-manager 0.0.9__tar.gz → 0.0.10__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (56) hide show
  1. {patch_manager-0.0.9 → patch_manager-0.0.10}/PKG-INFO +1 -1
  2. {patch_manager-0.0.9 → patch_manager-0.0.10}/patch_manager.egg-info/PKG-INFO +1 -1
  3. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/status.py +2 -1
  4. {patch_manager-0.0.9 → patch_manager-0.0.10}/pyproject.toml +1 -1
  5. {patch_manager-0.0.9 → patch_manager-0.0.10}/LICENSE +0 -0
  6. {patch_manager-0.0.9 → patch_manager-0.0.10}/README.rst +0 -0
  7. {patch_manager-0.0.9 → patch_manager-0.0.10}/patch_manager.egg-info/SOURCES.txt +0 -0
  8. {patch_manager-0.0.9 → patch_manager-0.0.10}/patch_manager.egg-info/dependency_links.txt +0 -0
  9. {patch_manager-0.0.9 → patch_manager-0.0.10}/patch_manager.egg-info/entry_points.txt +0 -0
  10. {patch_manager-0.0.9 → patch_manager-0.0.10}/patch_manager.egg-info/requires.txt +0 -0
  11. {patch_manager-0.0.9 → patch_manager-0.0.10}/patch_manager.egg-info/top_level.txt +0 -0
  12. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/__init__.py +0 -0
  13. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/__main__.py +0 -0
  14. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/checkpatch.py +0 -0
  15. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/cmdline.py +0 -0
  16. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/commit.py +0 -0
  17. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/control.py +0 -0
  18. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/cser_helper.py +0 -0
  19. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/cseries.py +0 -0
  20. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/database.py +0 -0
  21. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/func_test.py +0 -0
  22. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/get_maintainer.py +0 -0
  23. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/gmail.py +0 -0
  24. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/patchstream.py +0 -0
  25. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/patchwork.py +0 -0
  26. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/patman.rst +0 -0
  27. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/project.py +0 -0
  28. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/review.py +0 -0
  29. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/send.py +0 -0
  30. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/series.py +0 -0
  31. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/settings.py +0 -0
  32. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/test/0000-cover-letter.patch +0 -0
  33. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/test/0001-pci-Correct-cast-for-sandbox.patch +0 -0
  34. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/test/0002-fdt-Correct-cast-for-sandbox-in-fdtdec_setup_mem_siz.patch +0 -0
  35. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/test/get_maintainer +0 -0
  36. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/test/maintainers +0 -0
  37. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/test/test01.txt +0 -0
  38. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/test_checkpatch.py +0 -0
  39. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/test_common.py +0 -0
  40. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/test_cseries.py +0 -0
  41. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/test_settings.py +0 -0
  42. {patch_manager-0.0.9 → patch_manager-0.0.10}/patman/workflow.py +0 -0
  43. {patch_manager-0.0.9 → patch_manager-0.0.10}/setup.cfg +0 -0
  44. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/__init__.py +0 -0
  45. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/__main__.py +0 -0
  46. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/claude.py +0 -0
  47. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/command.py +0 -0
  48. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/cros_subprocess.py +0 -0
  49. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/gitutil.py +0 -0
  50. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/terminal.py +0 -0
  51. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/test_claude.py +0 -0
  52. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/test_command.py +0 -0
  53. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/test_gitutil.py +0 -0
  54. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/test_util.py +0 -0
  55. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/tools.py +0 -0
  56. {patch_manager-0.0.9 → patch_manager-0.0.10}/u_boot_pylib/tout.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: patch-manager
3
- Version: 0.0.9
3
+ Version: 0.0.10
4
4
  Summary: Create, check and email patch series, with Patchwork integration
5
5
  Author-email: Simon Glass <sjg@chromium.org>
6
6
  License-Expression: GPL-2.0-or-later
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: patch-manager
3
- Version: 0.0.9
3
+ Version: 0.0.10
4
4
  Summary: Create, check and email patch series, with Patchwork integration
5
5
  Author-email: Simon Glass <sjg@chromium.org>
6
6
  License-Expression: GPL-2.0-or-later
@@ -194,7 +194,8 @@ def create_branch(series, new_rtag_list, branch, dest_branch, overwrite,
194
194
  repo.merge_base(cherry.id, parent.target)
195
195
  base_tree = cherry.parents[0].tree
196
196
 
197
- index = repo.merge_trees(base_tree, parent, cherry)
197
+ index = repo.merge_trees(
198
+ base_tree, repo[parent.target].tree, cherry.tree)
198
199
  tree_id = index.write_tree(repo)
199
200
 
200
201
  lines = []
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "patch-manager"
7
- version = "0.0.9"
7
+ version = "0.0.10"
8
8
  authors = [
9
9
  { name="Simon Glass", email="sjg@chromium.org" },
10
10
  ]
File without changes
File without changes
File without changes