On 23 October 2014 07:49, Michael Tokarev <m...@tls.msk.ru> wrote: > If upstream already have a patch for this, why not take the > upstream's solution now, so we wont need to revert our solution > before applying next drop from upstream?
Upstream haven't released it yet. > BTW, how the "upstream drop" is done, anyway? If it is something > like git merge, we may need to care, but if it is just cp -a upstream/* . > when there's no reason to... ;) It's a copy. As you say, since it's just a copy we don't need to worry about merge conflicts so we can just fix it in a convenient way for us for the moment. thanks -- PMM