On 12-08-09 12:26 PM, Justin Lebar wrote:
This will however
bitrot most of your patches, so I have put together a script here
<https://bugzilla.mozilla.org/attachment.cgi?id=650572> which helps you
unbitrot them. This script handles mq patches, and needs to be run in the
top mozilla-central directory, and it creates a backup of your mq patches in
case something goes wrong.
I wonder what's the right thing to do for those of us using git (an
increasingly large population!). We can export all our branches as
patches, run your script, and then re-import the patches, but that's a
pain...
I feel like maybe what we should do is have a script which
git-rebase's a branch to the parent of your change, then automatically
exports the branch as patches, runs your script, and re-imports the
branch, as a child of your change.
Anyone have a better idea?
I don't know if there is a single answer for everybody who uses git.
Some people prefer to have the history of their branch available, and
they should use git merge and then git diff to fix up the remaining NSPR
types in their branch. Others don't care about the history and can just
rebase the way that you suggest (or just run git rebase on the head of
mozilla-central when this lands.)
Cheers,
Ehsan
_______________________________________________
dev-platform mailing list
dev-platform@lists.mozilla.org
https://lists.mozilla.org/listinfo/dev-platform
