Re: git-dpm: remove a patch

2017-07-05 Thread Vincent Bernat
❦ 5 juillet 2017 21:19 +1000, Brian May  : >> 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

Re: git-dpm: remove a patch

2017-07-05 Thread Vincent Bernat
❦ 5 juillet 2017 13:27 +0200, Nikolaus Rath  : >> How to remove a patch with git-dpm? > > Look for "Removing existing patches" in git-dpm(1): > > $ git-dpm checkout-patched > $ git rebase -i upstream-unstable > $ git-dpm dch -- -i That's totally similar to use "git reset --hard HEAD~1" (since

Re: git-dpm: remove a patch

2017-07-05 Thread Nikolaus Rath
On Jul 05 2017, Vincent Bernat wrote: > Hey! > > How to remove a patch with git-dpm? Look for "Removing existing patches" in git-dpm(1): $ git-dpm checkout-patched $ git rebase -i upstream-unstable $ git-dpm dch -- -i Best, -Nikolaus -- GPG Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FC

Re: git-dpm: remove a patch

2017-07-05 Thread Brian May
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

Re: git-dpm: remove a patch

2017-07-05 Thread Scott Kitterman
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 upd

git-dpm: remove a patch

2017-07-04 Thread Vincent Bernat
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 understa