On Feb 14, 2017, at 05:54 PM, Brian May wrote: >Not sure how to unapply all patches. "quilt pop -a" won't work, quilt >doesn't realize the patches are applied.
Yep, that does seem to be the problem. >Maybe something like the following? > >git read-tree --reset -u upstream >git reset -- debian >git checkout debian >git rm debian/.git-dpm >git commit This gets closer, but there still seems to be problems. gbp pq import gbp pq export --drop That seems to round trip okay, and it just removes a few crufty lines from the patches. The problem comes when you try to rebase your patches on top of upstream. gbp pq import git rebase -i upstream (way way more commits to pick from than expected) Hmm. -Barry
