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

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

git-dpm: remove a patch

Show all headers | View raw

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

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.
-- 
Use self-identifying input.  Allow defaults.  Echo both on output.
            - The Elements of Programming Style (Kernighan & Plauger)

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