On Wed, Oct 10, 2018 at 11:34:40AM +0100, Ian Jackson wrote: > Mmm, that seems like reasonable expectations - at least the first > half. I didn't try with --include-dirty. You were intending to push, > right ? You can't push with --includ-dirty.
Nope, just test building for now.
> > But from what you say it is going to do neither.
>
> I think with --include-dirty it might do what you expected. With that
> option it builds the source package from your own working tree.
Right, maybe I was too confused earlier.
> > I think that for that, the usual quilt linearisation that I saw dgit
> > doing in the past is cool enough.
>
> dgit's quilt linearisation requires that your tree is a linear (or at
> least linearisable) sequence of commits on top of { the original
> upstream source + your debian/ directory + whatever patches are in
> d/patches already applied }.
>
> You never made a commit like that. The dgit import isn't because it
> doesn't have debian/patches because it was an import of a
> 1.0-with-diff package.
Ohh, I see. I was missing this detail!
What would you think of importing the .diff.gz in a different commit
then? I think it would also appear a tad cleaner in the history (just
throwing out an irrelevant idea).
> > > But having done that IDK how you would rebase onto a new upstream
> > > version. You'll definitely need a workflow tool for that (or I guess
> > > you could do it by hand with raw git runes if you had iron
> > > concentration and an iron constitution).
>
> You say `use any random tool for rebasing the patches' but what tool
> would that be ? I don't think gbp pq can operate on a patches-applied
> tree, can it ?
Well, the whole point of `gbp pq` is to run on a patches-applied tree,
though I don't know if I can tell it to use a specific branch made by me
for that, instead of the generated one.
Failing that, I can always `patch -p1 -R` the patch, and then run
uupdate. But still, I'm not so concerned about this :)
> > * -wc to always stop *any* command from running if the working tree is
> > not fully committed
>
> I think in fact that this needs to be more general. For example, with
> --clean=dpkg-source: if dpkg-source leaves untracked files, this
> should be detected. I think this check should happen any time dgit
> builds a source package.
Sounds good to me.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
signature.asc
Description: PGP signature
