Demo of merging pygeos source into Shapely repo#1221
Demo of merging pygeos source into Shapely repo#1221jorisvandenbossche wants to merge 392 commits intoshapely:mainfrom
Conversation
Split single ufuncs.c file in multiple files
[Done] Separating Missing (NaG) and Empty
…adme Update README to include conda-forge installation instructions
Add versioneer and geos_version
|
One thing I already noticed: the commits from pygeos have the We could rewrite the commit messages from the pygeos source before merging to rename each Currently the workflow above preserves the commit hashes as they are in the pygeos repo (since it's a clean merge), editing the commit messages would of course change the hash. So a trade-off between preserving hashes vs preserving correct links in the git log on github. (I think I personally would prefer getting correct links) |
|
Such a commit message rewriting would be easily achieved with: using https://github.com/newren/git-filter-repo (the recommended alternative for git's own git filter-branch (https://git-scm.com/docs/git-filter-branch#_warning)). |
* Fix error handling in STRtree * Formatting * Update CHANGELOG.rst Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com> Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
* Document known issue with to/from shapely (pygeos/pygeos#424) * Document lazy evaluation in points (pygeos/pygeos#397) * Document behavior of get_dimensions (pygeos/pygeos#289) * Update pygeos/creation.py Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com> Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
efd7a31 to
780020f
Compare
780020f to
40a2cd4
Compare
|
OK, the merge is done! |
Nothing final, but just experimenting with a possible workflow for #962 (comment), to see what this gives / to decide what we exactly want (cc @caspervdw).
I followed the approach outlined in https://stackoverflow.com/a/10548919/653364. This doesn't use git subtree in the end, but actually a simple merge of a remote. This also doesn't add it to a subdirectoy, but I renamed the few conflicting files/dirs in advance in the pygeos source.
This results in a cleanly merged repo with history. You can see the git log of the created branch at https://github.com/jorisvandenbossche/Shapely/commits/merge-pygeos (and eg see recent commits of both shapely repo and pygeos repo intertwined).
The following commands completely reproduce the result (so this can easily be repeated whenever we are ready for the merge), starting from two fresh clones: