Hello Ian, On Sun, Oct 30, 2016 at 05:26:32PM +0000, Ian Jackson wrote: > Thanks a lot for your excellent contributions. I rewrote my own > wip.tutorials branch to have non-nonsense commit messages, rebased > your branch on top, and made two new commits of my own: > - to fix some missing quotes in a dch rune in dgit-nmu-simple > - to add a `local-pod-man' convenience script > > I have pushed the result to my public wip.tutorials branch. I think I > am going to try to avoid rebasing this again unless there's a good > reason. The rebasing seems just to cause trouble here, because there > is no interaction with (eg) the test suite.
So are you saying that all the commits in my branch from yesterday are now included in yours? It's hard for me to tell due to the rebasing. > I have implemented the --dgit-view-save option. You can find it in my > branch "wip" on chiark (very definitely rebasing, that branch!) I > haven't updated dgit-sponsorship(7) for it yet. Done in my wip.tutorials-new. > If I'm lucky I will manage to fix #841084 (gbp orig generation) and > provide support for DELAYED, today. I see some commits for this in your master branch, so I've gone ahead and added a commit to my wip.tutorials-new branch mentioning the option. On Sun, Oct 30, 2016 at 05:36:57PM +0000, Ian Jackson wrote: > Reading dgit-maint-gbp(7), I see this: > > INCORPORATING NMUS > % dgit --gbp pull > > Will this actually work ? I think it will apply the changes from the > NMU both to debian/patches/ and to the actual files. This will risk > conflicts in the upstream files (if previous patches touch the same > files) and generate a partially-applied git branch. > > It will also create a patch for .gitignore changes, which is probably > not desirable. Yes, I thought I might be being too optimistic about that. I've added a commit to my wip.tutorials-new saying that it doesn't work yet. > Maybe it is a bug that dgit --gbp pull doesn't DTRT. It could do some > kind of clever thing where it spots that we're in split brain mode and > merges only changes to debian/patches. > > But I think making this work in the general case (with all --quilt= > options etc.) is beyond the scope of what I have time for in the next > few days. > > Do you think that in the meantime I should make `dgit pull' bomb out > in split brain quilt modes ? I've filed another bug to keep track of this. -- Sean Whitton
signature.asc
Description: PGP signature
