Martin v. Löwis <mar...@v.loewis.de> added the comment: > 1) get a copy of Roundup 1.4.10 (maybe the one in vendor?);
I think I misremember how I did the last update; in any case, this was done in r76545, and cites http://pypi.python.org/pypi/roundup/1.4.10 as the source that was used. It may have been a diff to 1.4.8 indeed. The procedure I described before was apparently last used for upgrading to 1.4.7. The "vendor" directory isn't used anymore; Erik intended it to support better merging, but when I tried to use it, the merging failed because of the substantial changes. > 2) create a diff between the clean 1.4.10 and "our" 1.4.10 in roundup-src; > 3) get a copy of Roundup 1.4.19; > 4) replace the content of roundup-src and vendor with 1.4.19; > 5) apply the patch obtaind in 2) to roundup-src, adapting it if necessary; > 6) commit everything (or is it better to make 2 commits (update to 1.4.19 + > apply our changes)?); > > Right? That's what I would propose, yes - assuming you have the energy to review all of our local changes again. If not, you can as well try creating a patch between 1.4.10 and 1.4.19, and try applying that. _______________________________________________________ PSF Meta Tracker <metatrac...@psf.upfronthosting.co.za> <http://psf.upfronthosting.co.za/roundup/meta/issue411> _______________________________________________________ _______________________________________________ Tracker-discuss mailing list Tracker-discuss@python.org http://mail.python.org/mailman/listinfo/tracker-discuss
