search

IsaacSchemm / pdf.js-seamonkey

SeaMonkey fork of pdf.js
Apache License 2.0
25 stars 4 forks source link

Merge tag v2.3.200 #9

Closed psvenk closed 4 years ago

psvenk commented 4 years ago

This pull request brings the SeaMonkey extension up to date with pdf.js version 2.3. The tag v2.3.200 merged cleanly with no conflicts, and the resulting extension seems to work well on SeaMonkey and Pale Moon from my testing. I have initiated the pull request from my personal branch merge-v2.3 instead of directly from the tag on mozilla/pdf.js in case there is any additional work to do before this is ready to merge.

psvenk commented 4 years ago

I also have another branch, v2.3-rebased, which uses rebasing instead of merging so that the commit history is cleaner (and the commits on this branch are close to each other, like a patchset on top of the Mozilla code). Running git diff v2.3-rebased merge-v2.3 shows that the final tree in that branch is identical to the one in merge-v2.3. What are your thoughts on using that tree (this cannot be done with a GitHub pull request but requires other means as far as I know)?

IsaacSchemm commented 4 years ago

I suppose it makes sense to do an ordinary merge - that's what I've done in this repo in the past, so I might as well stick with it.

I'll try to take a look at this pull request this weekend (mostly to see if it works on my end, and then push a new version of the extension to addons.thunderbird.net if it does).

psvenk commented 4 years ago

Sounds good, thanks!