Sean Whitton <[email protected]> writes: > Hello Dima, > > Dima Kogan [30/Dec 12:00pm -08] wrote: >> I want to take an existing gbp repo and convert it to a dgit repo. To be >> clear, by "gbp repo" I mean: tracking debian/ in git, merging squashed >> upstream tarball with each release. By "dgit repo" I mean using the >> upstream git repo, and merging in the debian/ commits as needed. > > I'm not clear what workflow you think you are aiming for, but I would > first say that what you call a "gbp repo" is fully compatible with dgit, > and also compatible with switching to merging upstream Git history > instead of squashed tarballs. You would just start merging it. It > should work fine.
Hi. Thanks for replying. I did read the docs, and the "maint-merge" workflow is what I'm pretty sure I want. There's so much complexity here that it's hard to know if I'm doing something wrong or I'm hitting a bug. I just looked into it again just now, and I'm pretty sure that this is either a bug or a case that dgit doesn't handle well (yet?). It looks like dgit looks through all of the git history, and if it sees any commits that it doesn't know about that touch debian/patches, it gives up. Right? Here I tried to manage this by removing all the debian/patches commits from my debian branch before merging it. However, as I was just reminded, many years ago the upstream git tree had the debianization in it. This was removed years ago, when mrcal was uploaded to Debian, but it's still in the history and dgit still sees it and barfs. Since this is in the upstream tree, I cannot just remove those commits. dgit should probably not react to the debian/patches commits prior to those files being deleted. Suggestions? Thank you.
