Hi David, On Wed, Dec 20, 2006 at 11:54:40PM -0500, David Nusinow wrote: > Package: git-buildpackage > Version: 0.2.12 There's 0.2.18 in experimental which fixes somethings (unfortunately not this problem)
> Similarly, if I create the upstream branch, then delete the debian > directory there, so that the packaging info is only in the master branch, > and run git-import-orig, the same thing happens. This is apparently because > git-import-orig runs 'git pull . upstream', which pulls all the changes > from upstream in to master, including the change that deleted the debian > dir. In order to make this work, I have to manually revert the master dir > and cherry-pick the import change, thus avoiding the change that deletes > the debian dir. > > I'm not sure if this is a suitable method for git-import-orig to do, but > it does get me what I need in order to build the package. The problem here is indeed that we have to create the upstream branch from an existing branch, this isn't a problem in the case of a new repository but it really hurts us in the case you describe. Is there any point in the repositorie's history where master or any other branch carried the clean upstream sources without the debian/ dir? In this case you could branch the "upstream" branch from there and everything should work as expected. I have to add this to the documentation. I still have to think of a clean way to make git-import-orig work on existing repositories that don't have the clean upstream sources at any point in history - suggestions welcome. Cheers, -- Guido -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
