Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.debian.maint.python > #9609
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Scott Kitterman <debian@kitterman.com> |
| Newsgroups | linux.debian.maint.python |
| Subject | Re: git-dpm: remove a patch |
| Date | Wed, 05 Jul 2017 13:10:02 +0200 |
| Message-ID | <tZQlY-5sb-13@gated-at.bofh.it> (permalink) |
| References | <tZMs2-2Ms-25@gated-at.bofh.it> |
| X-Mailbox-Line | From debian-python-request@lists.debian.org Wed Jul 5 11:09:02 2017 |
| Old-Return-Path | <debian@kitterman.com> |
| X-Amavis-Spam-Status | No, score=-11.98 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FOURLA=0.1, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham autolearn_force=no |
| X-Policyd-Weight | using cached result; rate: -5 |
| Dkim-Signature | v=1; a=rsa-sha256; c=simple/simple; d=kitterman.com; s=201409; t=1499252926; bh=tQ60AYbgxsLos/KqDIatbIZC6/xEKbRNzuRFtWeuc+k=; h=From:To:Subject:Date:In-Reply-To:References:From; b=hFLanTKOdkCx8nFkVKZaB4G02cT6FI/DqVrrYl7IS1ff062PMA25fqI+IHiiOmfC8 bmOJXBz5f0likpruhaqw4nkXdvHVH5hfPRmbOnRnNCgMq94/rP1/ztBBQ6O2qHoYuW LDwAGzSDqz433jHCOPSKKk+wgFGRCpH/tptnzHas= |
| User-Agent | KMail/4.13.3 (Linux/3.13.0-121-generic; KDE/4.13.3; x86_64; ; ) |
| MIME-Version | 1.0 |
| Content-Type | multipart/signed; boundary="nextPart3323245.iDcKfDIL9l"; micalg="pgp-sha256"; protocol="application/pgp-signature" |
| X-Mailing-List | <debian-python@lists.debian.org> archive/latest/14988 |
| List-ID | <debian-python.lists.debian.org> |
| List-URL | <https://lists.debian.org/debian-python/> |
| List-Archive | https://lists.debian.org/msgid-search/2522781.1LMD08NidF@kitterma-e6430 |
| Approved | robomod@news.nic.it |
| Lines | 80 |
| Organization | linux.* mail to news gateway |
| Sender | robomod@news.nic.it |
| X-Original-Date | Wed, 05 Jul 2017 07:08:41 -0400 |
| X-Original-Message-ID | <2522781.1LMD08NidF@kitterma-e6430> |
| X-Original-References | <m3h8yrjs09.fsf@luffy.cx> |
| Xref | csiph.com linux.debian.maint.python:9609 |
Show key headers only | View raw
[Multipart message — attachments visible in raw view] - view raw
On Wednesday, July 05, 2017 08:51:34 AM Vincent Bernat wrote:
> 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.
Did you try they way it says in man git-dpm:
Removing existing patches
First get the master branch:
git clone URL
Create the patched branch and check it out:
git-dpm checkout-patched
Get a list of commits since the last upstream release: git
rebase -i upstream-unstable
This will open your default editor with a list of commits. Edit
the list to remove undesired commits.
...
git commit
Then you want to get those changes into the Debian branch and
the old patch files deleted (which you can do using git-dpm update-patches),
but you most likely want to also document what you did in the
changelog, so all in one step:
git-dpm dch -- -i
Perhaps change something in the Debian packaging:
...
git commit -a
Then push the whole thing back:
git push
Scott K
Back to linux.debian.maint.python | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll 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