Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)
Barry Warsaw <barry@debian.org> writes:
> On Feb 14, 2017, at 05:54 PM, Brian May wrote:
>>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)
The patch-queue branch is based on the Debian branch, not upstream. Try
merging the new upstream version to your Debian branch, and then running
gbp pq rebase.
--
Arto Jantunen
Reply to: