Groups > linux.debian.maint.python > #9607

git-dpm: remove a patch

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Vincent Bernat <bernat@debian.org>
Newsgroups	linux.debian.maint.python
Subject	git-dpm: remove a patch
Date	Wed, 05 Jul 2017 09:00:02 +0200
Message-ID	<tZMs2-2Ms-25@gated-at.bofh.it> (permalink)
X-Original-To	debian-python@lists.debian.org
X-Mailbox-Line	From debian-python-request@lists.debian.org Wed Jul 5 06:59:24 2017
Old-Return-Path	<bernat@debian.org>
X-Amavis-Spam-Status	No, score=-11.88 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FOURLA=0.1, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5] autolearn=ham autolearn_force=no
X-Policyd-Weight	using cached result; rate: -5
X-Greylist	delayed 455 seconds by postgrey-1.35 at bendel; Wed, 05 Jul 2017 06:59:12 UTC
Organization	Debian
Mail-Followup-To	debian-python@lists.debian.org
User-Agent	Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux)
MIME-Version	1.0
Content-Type	multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature"
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/14986
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/m3h8yrjs09.fsf@luffy.cx
Approved	robomod@news.nic.it
Lines	46
Sender	robomod@news.nic.it
X-Original-Date	Wed, 05 Jul 2017 08:51:34 +0200
X-Original-Message-ID	<m3h8yrjs09.fsf@luffy.cx>
Xref	csiph.com linux.debian.maint.python:9607

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

Hey!

How to remove a patch with git-dpm?

I have tried:

git-dpm c-p
git reset --hard HEAD~1
git-dpm u-p

And got:

git-dpm: Calling merge-patched-into-debian first...
git-dpm: ERROR: cowardly refusing to update patched to already merged version!. Use --allow-revert to override!

I don't understand what it means. git-dpm tag doesn't report anything
suspicious so I suppose that debian/.git-dpm is correct.
-- 
Use self-identifying input.  Allow defaults.  Echo both on output.
            - The Elements of Programming Style (Kernighan & Plauger)

Back to linux.debian.maint.python | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

git-dpm: remove a patch Vincent Bernat <bernat@debian.org> - 2017-07-05 09:00 +0200
  Re: git-dpm: remove a patch Scott Kitterman <debian@kitterman.com> - 2017-07-05 13:10 +0200
  Re: git-dpm: remove a patch Brian May <bam@debian.org> - 2017-07-05 13:30 +0200
    Re: git-dpm: remove a patch Vincent Bernat <bernat@debian.org> - 2017-07-05 16:50 +0200
  Re: git-dpm: remove a patch Nikolaus Rath <Nikolaus@rath.org> - 2017-07-05 13:40 +0200
    Re: git-dpm: remove a patch Vincent Bernat <bernat@debian.org> - 2017-07-05 16:50 +0200

csiph-web