Albert Astals Cid <[email protected]> writes: > El Dimecres, 4 de juny de 2014, a les 20:20:17, Carlos Garcia Campos va > escriure: >> Albert Astals Cid <[email protected]> writes: >> > Has anyone done any preliminary diff between 3.03 and 3.04? >> >> I dind't even know it :-P >> >> > How hard is it going to merge? >> >> I guess like usual, some parts trivial and some others quite difficult. >> >> > I'm ultra *behind* on reviewing/regtesting existing patches so i don't >> > think i'll be able to do this for a while, but is something that >> > defenitely needs doing. >> >> I'll try to find to time to work on this. Maybe we can setup a repo like >> last time with the diff, and start merging individual changes to a >> branch. Once a chunk of the diff is merged in the xpdf-304 branch it's >> removed from the diff in the repo until the diff is empty :-) > > Looks good, do you think you can set that up?
Done. I've reused the old repo, see: http://cgit.freedesktop.org/~carlosgc/poppler-xpdf3merge/ I've added the new diff file, I did an initial cleanup but I'm there are more things not interesting for us. I've also added the CHANGES file and a README with some instructions. All poppler committers can push there. I've also created the xpdf304merge branch in poppler repo. Since I know people tend to not read REAME files, I'll paste it here :-) Workflow: - Look for a change to merge. If you find things in the diff that are not relevant to poppler, just remove them from ALL_DIFF file and push. - Try to identify the change in the CHANGES file too if possible - Manually apply the changes to poppler. - Ideally we would merge individual features or fixes, but it's not always possible to indentify the changes. In any case, make sure every single revision you commit to poppler xpdf-304 branch builds and doesn't crash. This will make easier to regtest the changes and bisect to find regressions if needed. - Push the commit to poppler xpdf304merge branch. Please, remember to prefix all the commits with xpdf304: to easily identify those commits once merged into master. - Remove the merged chunks from the ALL_DIFF file and remove also the merged feature/fix from the CHANGES-3.04 file. - Commit and push - Once the ALL_DIFF file is empty, we are done \o/ Have fun! > Cheers, > Albert > >> >> > Cheers, >> > >> > Albert >> > >> > _______________________________________________ >> > poppler mailing list >> > [email protected] >> > http://lists.freedesktop.org/mailman/listinfo/poppler > _______________________________________________ > poppler mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/poppler -- Carlos Garcia Campos PGP key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x523E6462
pgpO732NVDVqV.pgp
Description: PGP signature
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
