On 27 February 2018 at 20:17, Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote: > I was just merging with the latest Sparse today. > > I merged some code back in 2013 which never made it into the official > Sparse tree and that's still a real pain for me up to today. I feel > like it's way too tempting to pull from one of the non-official forks > because there are all these tantalizing features out there but you have > to wait very long for them to hit mainline. Then it comes back to bite > you on the butt for the next 5 years. > Hi, I maintain more than one project based upon upstream projects (one of them being based on Sparse) where I have made several modifications. Sometimes I wish the upstream projects were frozen forever - as it is so painful merging changes. I have to do it by hand, one by one (I use the BeyondCompare diff tool). So yes, maintaining a forked version is extremely painful. It also means you can't diverge too much from the upstream code because then merging changes would be impossible. Regards Dibyendu -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
