> > 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.
Please dowload http://yoush.homelinux.org:8079/nikita/libetpan-packages.tar.bz2 (11M) It contains several previously-released vesions of libetpan debian source packages in libetpan/old/, and a new upstream tarball in libetpan/new/ Then run: tar xjf libetpan-packages.tar.bz2 cd libetpan git-import-dscs old/*.dsc This will create a git repo in libetpan/ and import previous packages there. All upstream versions will reside in 'upstram' branch, all debian packages will reside on 'master' branch. Then run cd libetpan git-import-orig ../new/libetpan-0.56.tar.gz This will result into lots of conflicts. I was able to workaround this by replacing signle 'git-import-dscs old/*.dsc' command with the following procedule: - import first upstream tarball (0.45) using git-import-orig, - import debian packages created for that upstream version (0.45-1 .. 0.45-4) one-by-one using git-import-dsc, - importing next upstream tarball (0.46) using git-import-orig, - manually merge upstream branch into master branch, - import debian packages created for that upstream version (0.46-1 .. 0.46-4) one-by-one using git-import-dsc, - repeat last 3 steps for all next upstream versions. After this procedure, git-import-orig successfully imported the new upstream tarball, without any conflicts. I believe git-import-dscs should do something similar. WBR, Nikita P.S. Please notify me when I may delete libetpan-packages.tar.bz2 from the above URL.
signature.asc
Description: This is a digitally signed message part.
