In a comment to my previous post Harvey Thompson mentioned a tool called reposurgeon that is supposed to take care of the exact problem I had (merg...
For further actions, you may consider blocking this person and/or reporting abuse
Yes, I also had similar issues with trying to learn reposurgeon.
In the end it was "easier" (perhaps not faster, but less headaches) to use git commands and lots of google/StackOverflow searching.
What I did take from reading up on reposurgeon is that it's a good idea to iterate on a solution:
I ended up iterating on a Makefile which contained various git commands to take the source repositories (I think there were 13?).
At each step I added more git commands to filter commits, add branches and tags, add commit messages to map original commits to new commits, etc.
Once I was fairly happy with the result, I started trying to use the merged repo, found a few mistakes and had to rebuild it from scratch again, and keep iterating.
Took under a week to do, and theoretically I could run that script again at any time (with possible fixes) to produce an alternative branch, if I ever find issues.
It's indeed a shame that reposurgeon is super-niche. I suspect that's why the author charges consultancy fees (which is fair enough).
Yeah, I also iterate on scripts and use
gitto keep track of progress. I don't domkdir ...anymore for new projects, I just saygit init ....I needed to merge 5 git repos into a monorepo this weekend, and I felt like being fancy and keeping history (wasn't strictly necessary in this case), so I just did this by hand: saintgimp.org/2013/01/22/merging-t...
It wasn't too bad.
The link is broken
Thank you!
Not anymore :D
From the documentation it sounds like a tool for someone who manages database translations and history pruning as their career.
Clearly not me =)