albertz
commented
13 years ago Copy of what I wrote in the mailinglist:
Hey,
Before we can really update the Breakpad sources, we need to get a good overview of the changes we have made so far on it.
So, to get this, I exported them all to some own repository and also integrated the official Breakpad SVN history and in a separate branch we also have the official up-to-date Breakpad trunk.
This was not so trivial to do and I explained in detail how I accomplished all this here:
http://stackoverflow.com/questions/6088551/git-what-is-a-graftcommit-or-a-graft-id
And the result is this repository:
https://github.com/albertz/google-breakpad
This is a perfect base now to do further work. E.g., the next steps would be to create a new branch based on the official trunk in there rebase all the patches we made so far in there. Name that branch e.g. "olx-rebased" or so. Via rebasing, we also should clean up the patches in a way that we can send them to upstream.
I don't know yet how we should have Breakpad in the OLX Git repo exactly. A Git submodule would be the common way but it means further complication for getting the code. And I don't like that. I am currently thinking of just having a copy in there and then push any changes to both repositories.
The Google Breakpad library we have in our repository is much outdated. It should be updated.
Though, we have a few OLX custom things already in it. Some of them are still needed.
So, someone should collect all the Breakpad specific commits, then update Breakpad and then try to reapply those commits which are still relevant.
Best would be to prepare those commits in a way so that we can get them upstream later so that we don't have those problems in the future.