Path: csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod From: Vincent Bernat Newsgroups: linux.debian.maint.python Subject: Re: git-dpm: remove a patch Date: Wed, 05 Jul 2017 16:50:01 +0200 Message-ID: References: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Wed Jul 5 14:48:51 2017 Old-Return-Path: X-Amavis-Spam-Status: No, score=-11.98 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5] autolearn=ham autolearn_force=no X-Policyd-Weight: using cached result; rate: -5 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/14993 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/87k23naqii.fsf@luffy.cx Approved: robomod@news.nic.it Lines: 43 Sender: robomod@news.nic.it X-Original-Date: Wed, 05 Jul 2017 16:48:37 +0200 X-Original-Message-ID: <87k23naqii.fsf@luffy.cx> X-Original-References: <8760f7m8px.fsf@prune.linuxpenguins.xyz> Xref: csiph.com linux.debian.maint.python:9613 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable =E2=9D=A6 5 juillet 2017 21:19 +1000, Brian May =C2=A0: >> git-dpm: Calling merge-patched-into-debian first... >> git-dpm: ERROR: cowardly refusing to update patched to already merged ve= rsion!. Use --allow-revert to override! > > Have you tried doing what it suggests, using the --allow-revert > parameter? > > I believe git-dpm sees you removing a patch and assumes you might be > doing something wrong - so it stops you. However as you know what you > are doing, you should override it. This seemed to have worked as expected: the patch is gone. =2D-=20 "Elves and Dragons!" I says to him. "Cabbages and potatoes are better for you and me." -- J. R. R. Tolkien --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEErvI0h2bzccaJpzYAlaQv6DU1JfkFAllc/EUACgkQlaQv6DU1 Jfn8rA//aWzakqowieRpX79Fq/LK2nvILxAxbvYbt7usv//5UKgPY7iNm7k705K1 4ZPX1eUHrRq5D7JoZYDgOAHqGhvVkF0FQQ/Ui8s0+p7Ud3lgLaTACZsrL+xeRO2D ZS/pG2ep8u35QdhwTLFFNtKiScMwUK7WGoLZKIuCA+YHuTH0dtEGpOekehu2cIA/ X0YBFX4OPNzIT+3TwJ9cTqPMhIqlcXYuEzuTaM8AdoUm3m7/btLqiiul2AtzWMhl NiYBI7/RVPOJqFL8b4dGVskGqvhaZNvb1UBLXx6DH0UKkin9Gzvm7PSd5E30wslO phn3d8k0axoQnytctEQ82ZhkxsLRENZUU7Eaa6tZVH72UZ3Tz2lRxH30xqjQTdWb TTcoinEH2JJaEMYbSWqzY03dfxfBOiVJ1FRa7YBSvXLRcsJoKDvO3qxr6j45TOUm p/MxCsdPY0Htxc/sUvKu0t2SOSndn9dBzOodITbCiKWyMAIxgAfOR5yuDknwxRJE KilVp+bfVr/8PnVOp8a4ADvyKriDYJ6JN3SteFEKas123kTUNYJe6Fk7v7XvDeOI OodZlPVeVwXiHkJv2YVCqa6YByCX3eVP3XxoyrngcsgzGInMuUgJDmDlJ/L9fFM2 SjRrJwp23ggIWIr1OY379pAg6uOXNNQ9yqzp7ccG/Hl4gZqnbJg= =uW7N -----END PGP SIGNATURE----- --=-=-=--