Package: dgit
Version: 2.14
Severity: wishlist

Hi,

when working working on a 3.0 (quilt) package with dgit I find myself
running into the situation that I want to add a new patch, so I do:

  $ dch -i
  $ vim my/upstream/file
  $ git add my/upstream/file debian/changelog
  $ git commit -m "fixed my/upstream/file"
  $ dgit sbuild

Dgit will then craft a commit creating a new patch in debian/patches and
build my package.

The problem/inconvenience occurs if my changes were not sufficient and
my patch still fails. Then I find myself repeatedly having to do the
following:

  $ vim my/upstream/file
  $ git add my/upstream/file
  $ git commit -m "fixed my/upstream/file"
  $ dgit sbuild

I cannot do "git commit --amend" because the last commit is dgits commit
adding something into debian/patches. And as I keep working on fixing
the issue and testing it, my commit stack as well as my content of
debian/patches grows.

I now found myself with 17 individual patches in debian/patches and
thought it was time to report this bug asking for help.

Currently, once I'm happy with my changes I would do "git rebase -i" to
remove all the dgit-created commits and squash my other commits into a
single one. With 17 different commits this becomes tedious...

Is there a simpler way to do this?

Thanks!

cheers, josch

Reply via email to