Quoting Vasudev Kamath (2014-05-19 12:58:29) > On Mon, May 19, 2014 at 12:56 PM, Fabian Greffrath <fabian@greffrath.com> wrote: >> I remember we discussed this before. I think bubulle prepared that >> sprecific upload in order to fix some missing roboto fonts but did >> not follow the steps outlined in README.Source. We were not able to >> reproduce how the source tarball was created back then, though > > Right I remember that. But I'm just wondering why its throwing in a > conflict now, I was checking if I can pass merge option like -s > recursive -X theirs to git-import-orig but couldn't find any such > methods. So I'm now just clueless on how I should handle and merge new > release. > > Possible way re-import older version from git again into the package > tree > - but not sure if it succeeds without conflict. > - even if it succeeds without conflict it will messup the package > history > > Do you see any other methods? What I do when git-import-orig cause conflict is this: 1) git rm -rf $everything-except-our-debian-subdir-and-.gitignore 2) cp $everything-from-orig-tarball . 3) git add $everything-except-our-debian-subdir-and-.gitignore 4) git commit (and delete the lines about conflicting files) - Jonas -- * Jonas Smedegaard - idealist & Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private
Attachment:
signature.asc
Description: signature