Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Vincent Bernat Newsgroups: linux.debian.maint.python Subject: git-dpm: remove a patch Date: Wed, 05 Jul 2017 09:00:02 +0200 Message-ID: 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: 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: archive/latest/14986 List-ID: List-URL: 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: Xref: csiph.com linux.debian.maint.python:9607 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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 versi= on!. 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. =2D-=20 Use self-identifying input. Allow defaults. Echo both on output. - The Elements of Programming Style (Kernighan & Plauger) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEErvI0h2bzccaJpzYAlaQv6DU1JfkFAllcjHYACgkQlaQv6DU1 Jfna2g//eDgMNfSqpgZ4dRgOQl58zFNBViJAjpchpV/6uXrn8bIHeb9MKJ0aKFax imydGwPICM+wz0QxidW1rtOiql+GBIC/HlGTraqHUjO02etwSJF4RahKR8ptSIgb 5Hy0Jiw0Q5PDR1ZVV0mHHhhD76ltQNP7mvbiiwnwEZ09fpRXYB/fVDW+bPPlutw2 VDWGC5U+Wtjpt5Ub8VvL03JwhsMlMm+iedCpuMteeDmOzIGTwxcPAu2GRYEutCDW UkBBJ2svUTb+QoXu9vGkTCiBrlqhiJ8r3yZJg8yiFKE17zxfy0qFeup77/XWNnEy 6nH3d/XPZwWy2KK+iKvBUf4wx13fHE+sUNLA9E54hu0p/uyiZkHp5dDj488ahkzN 5zparLJWlG2LV7JDAXyRdBCJzPFhk2ap1K/hUemVM41h6Z+dFpwRwzF+s8sIGRSh p4eUD2AbAAwoG38gTXV0L2ViSIinL200pDvblY/pXpOg9COxVD0PyAVQlr4jWcjc FnwyOx8IDcm45nwSGkjcdVXmosoJ2+GGZg5zbl7ZvjG1DFobU5sYrfJmt+ZJUsXN VCGwVDDZEEtFZz/Nirl1UqUwprVF6wxrLuTrxwQCt6pVr68d4/bsJ6sux8HSdpQb sPCSBcvhNdM/DxFuAGIpRzr4+/wiBFMbl74bUE99JuBvJYnMUtE= =WDTT -----END PGP SIGNATURE----- --=-=-=--