Hi I tried to import one of my packages, namely libetpan, into a git repo, and faced the exact situation described in #475571. After importing released package versions, new orig.tar.gz failed to merge because git attempted to apply old changes in upsteam branch to debian branch while those have already been there. My debian packaging does not touch anything outside of debian/ but still merge failed because (as far as I understand) while merging, patch from upstream version A to upstream version B failed to apply on master branch because it already contained change from version B to version C touching same file parts.
After thinking a bit, I was going to suggest a solution similar to one by Matej Vela suggested in this bug, but not exactly the same. I suggest to automatically merge upstream into debian, but not after importing each dsc, but after importing of each new orig. Which is probably the same, but not 100% sure. Btw, please fix this issue - there are already at least two maintainers (Matej Vela and myself) who faced it :) Regards, Nikita
signature.asc
Description: This is a digitally signed message part.
