Hi Sean,

Quoting Sean Whitton (2017-01-28 20:59:16)
> One thing you can do is aggressively branch.  I.e.
> 
>     git checkout -b fix-foo
>     hack, commit, sbuild, hack again, commit, sbuild
>     # now undo all changes to d/patches
>     git checkout master -- debian/patches
>     git add debian/patches && git commit
> 
>     # now merge all your changes as a single commit, which will be
>     # converted to a single patch
>     git checkout master
>     git merge --squash fix-foo

okay, then I find my rebase method at the end a tad simpler. :D

> An alternative is to set up a longer-lived unstable chroot, and `dgit clone`
> into that chroot.  Once you've done your work, you can upload with `dgit
> rpush`.  Or possibly `dgit push` from outside the chroot.

You mean install dgit into the chroot? Then it would not be clean anymore.

> Neither of these options are particularly pleasant.

Yes.

> You can use gbp-pq(1).

I guess another tutorial how to use gbp-pq with dgit would be useful here.

Thanks!

cheers, josch

Attachment: signature.asc
Description: signature

Reply via email to