This is all my fault. I committed twice into the master branch for fixes to holidays files: 88dcc058172f8f529a01d10593940de75f0b33c7 was for Hong Kong holidays c88b89db49874407ba4b7cf0266208fb64cb6b33 was for Ukraine holidays.
all I wanted to do was get those commits into the Applications/16.12 branch. looks like I merged instead of cherry-picked. No other changes except for those holidays files should be in the Applications/16.12 branch from me. On Monday, March 13, 2017 12:07:14 AM Albert Astals Cid wrote: > El dissabte, 11 de març de 2017, a les 17:30:27 CET, Albert Astals Cid va > escriure: > > El divendres, 10 de març de 2017, a les 14:14:35 CET, Andreas Sturmlechner > > va > > escriure: > > > Merge commit c8f9b01c480de6bc561fa96289260e2bb82d4a1e bumped cmake min > > > version and PIM_VERSION. > > > > > > Attached patch might fix it, unless you want to blacklist. > > > > I'm honestly not convinced this guarantees a re-spin of a tarball we've > > already published, since bascically it'd need to be 16.12.4 > > > > Now actually adding the kdepim mailing list. > > > What do others think? > > Cheers, > Albert > > > > > Cheers, > > Albert > > > > > Regards, > > > Andreas > > > > > > > > > ---Original Message--- > > > > > > On Friday, 10 March 2017 at 14:10, Andreas Sturmlechner wrote: > > > > master was merged twice into Applications/16.12 branch and bumped > > > > > > KF5_VERSION, > > > > > > > cmake minimum version and PIM_VERSION. > > > > > > > > Bad (version bumping/dropping) commits: > > > > c714ab94bc5d3f82e6de135798f905f27f19fc64 > > > > 065c4028f97268466b22afb59eae2cbb37994a40 > > > > 4594308464a3ee8386c6e85e643dc7dac052e250 > > > > > > > > This will need a tarball respin. > > > > > > > > Best regards, > > > > Andreas > >