Path: csiph.com!feeder.erje.net!2.eu.feeder.erje.net!newsfeed.datemas.de!weretis.net!feeder4.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Brian May Newsgroups: linux.debian.maint.python Subject: Re: git-dpm: remove a patch Date: Wed, 05 Jul 2017 13:30:02 +0200 Message-ID: References: X-Mailbox-Line: From debian-python-request@lists.debian.org Wed Jul 5 11:20:30 2017 Old-Return-Path: X-Amavis-Spam-Status: No, score=-6.979 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.001, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham autolearn_force=no X-Policyd-Weight: DYN_NJABL=SKIP(0) NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .microcomaustralia. - helo: .mail-pg0-x22e.google. - helo-domain: .google.) FROM/MX_MATCHES_NOT_HELO(DOMAIN)=0; rate: -5 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microcomaustralia.com.au; s=google; h=sender:from:to:subject:in-reply-to:organization:references:date :message-id:mime-version; bh=soEtXP988hFkb/e+LDDoPz0Pug/uKbieoZApP+m8NB0=; b=OzoKABdORKJ1Ejjg2k4fmGztyjPMIproVo2U92uJ127gilZTKhMUHCjOIWmqKHiqBg NuEa25GoXCJ4ONz8e/lWVc4zgAIS78vFKXN7JP07MFNVb7GDE1D5VhxAOZ8On6X/9pyJ 3VmMGVbjorHrjOiN62uOIE/2yCmTVFV7YxXJY= X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:in-reply-to:organization :references:date:message-id:mime-version; bh=soEtXP988hFkb/e+LDDoPz0Pug/uKbieoZApP+m8NB0=; b=f2nslgcLZiZwu3L/liAdLcnneXEPplyXYT6XpPQYEihuJ/R68HoS9lJORDLa9CrSG7 UFwgnpH2lfgyK+kJmCSvy4OhDPqwlKlPQODD6WLNchhq0xCvpiXwGu/daRFrAAsqQzAh 08/Yx/USOagj8DI9wz4QypiIYcAZwoy03penaNNXTWoQOi/fV7byBeL16DiH2K1r1kU0 nWCR4OUgdhMxarpVtcCYbdPAgt2NJo4/1K+nngRwVNW3pEh3Wd+A5PJbKvd+AChauJN9 MSC2C2gXQ2hm3DuRtzL2oj2UAVdGU6EYlIUtbDy5cbU2CZSkGfQm36Wvp0YC2VJd3T53 yqNQ== X-Gm-Message-State: AIVw113wVZsudxf2nPjvaRPic583wF558NL1vl4/ooDkWuc1m5arCffr jrccPg+hIweWBhTV X-Received: by 10.98.70.86 with SMTP id t83mr19674745pfa.219.1499253600115; Wed, 05 Jul 2017 04:20:00 -0700 (PDT) Sender: robomod@news.nic.it Organization: Debian MIME-Version: 1.0 Content-Type: text/plain X-Mailing-List: archive/latest/14989 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/8760f7m8px.fsf@prune.linuxpenguins.xyz Approved: robomod@news.nic.it Lines: 13 X-Original-Date: Wed, 05 Jul 2017 21:19:54 +1000 X-Original-Message-ID: <8760f7m8px.fsf@prune.linuxpenguins.xyz> X-Original-References: X-Original-Sender: Brian May Xref: csiph.com linux.debian.maint.python:9610 Vincent Bernat writes: > 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. -- Brian May