[Git-dpm-user] Updating patches to remove fuzz after import-new-upstream

[Barry Warsaw]

I'm wondering about the git-dpm preferred way to update patches to eliminate
fuzz.  I also have a question about working in the patched branch.

The scenario is that I'm trying to update the git-dpm maintained tox package
from 1.8.0 to 1.9.2.  I use uscan to get the new upstream tarball, and then:

$ git-dpm import-new-upstream --ptc --rebase-patched ../tox_1.9.2.orig.tar.gz

So far so good.  However, now when I git-buildpackage it, I get these errors:

dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch '0002-Remove-the-virtualenv-versioned-requirements.patch' is correctly applied by quilt, use 'quilt refresh' to update it

I don't want to use quilt to clean these up, I want to use git-dpm of course!

I can `git-dpm checkout-patched` and then `git rebase -i upstream` but here's
where I hit my first problem... and second question.

I'm having a hard time understanding which files are touched by the quilt
patch I'm currently editing via rebase -i.  There's probably some obvious (or
non-obvious) git command to figure this out, but since I don't have the
debian/patches directory at this point, I can't look at the diff.  I'm also
somewhat guessing as to which quilt patch I'm looking at.

The best I've been able to muster is to have a second clone of the package
repo and look at that while I'm in rebase -i mode.

So anyway, let's say I figure out which file I need to unfuzz, how do I
actually do that?  If there are merge conflicts, I can fix those, `git add`,
and then `git commit --amend`, but what if there are no conflicts, just some
fuzz?  How do I clean those up while rebasing in the patched branch?

Or do I just ditch the convenience of git-dpm and drop down to quilt to
refresh the patch without fuzz?

Cheers,
-Barry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/git-dpm-user/attachments/20150423/d3e5a693/attachment.sig>