On Sat, Sep 06, 2008 at 11:43:01PM +0400, Nikita V. Youshchenko wrote: > 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. Please provide a way to reproduce this. -- Guido
-- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
