Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


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

Re: git-dpm: remove a patch

Path csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From Vincent Bernat <bernat@debian.org>
Newsgroups linux.debian.maint.python
Subject Re: git-dpm: remove a patch
Date Wed, 05 Jul 2017 16:50:01 +0200
Message-ID <tZTMR-7yB-9@gated-at.bofh.it> (permalink)
References <tZMs2-2Ms-25@gated-at.bofh.it> <tZQFk-5Al-35@gated-at.bofh.it>
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 <bernat@debian.org>
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 <debian-python@lists.debian.org> archive/latest/14993
List-ID <debian-python.lists.debian.org>
List-URL <https://lists.debian.org/debian-python/>
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 <m3h8yrjs09.fsf@luffy.cx> <8760f7m8px.fsf@prune.linuxpenguins.xyz>
Xref csiph.com linux.debian.maint.python:9613

Show key headers only | View raw


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

 ❦  5 juillet 2017 21:19 +1000, Brian May <bam@debian.org> :

>> 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!
>
> 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.
-- 
"Elves and Dragons!" I says to him.  "Cabbages and potatoes are better
for you and me."
		-- J. R. R. Tolkien

Back to linux.debian.maint.python | Previous | Next — Previous in thread | 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