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
>g
Barry Warsaw 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 p
On Feb 14, 2017, at 06:30 PM, Arto Jantunen wrote:
>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.
This confuses me, or I'm doing something wrong. With git-dpm the way to drop
patch
On Tue, 14 Feb 2017 at 11:44:33 -0500, Barry Warsaw wrote:
> So how do I drop a patch with gbp-pq?
rm debian/patches/this-got-fixed-upstream.patch, vi debian/patches/series,
commit? :-)
Or more generally, to do it the git way, if the rest of the patch series
might need non-trivial adjustment:
gi
Barry Warsaw writes:
> On Feb 14, 2017, at 06:30 PM, Arto Jantunen wrote:
>>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.
>
> This confuses me, or I'm doing something wrong. With
On Tuesday, February 14, 2017 06:23:43 PM Brian May wrote:
> Scott Kitterman writes:
> > We know in the DPMT context what debcheckout will produce, so for our
> > purposes they don't matter.
> >
> > How does dgit avoid maintainer forgot to push problems without being
> > limited to the granularit
6 matches
Mail list logo
