Re: git-dpm: remove a patch
❦ 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? > > 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 signature.asc Description: PGP signature
Re: git-dpm: remove a patch
❦ 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 I want to remove the last commit). -- Make sure all variables are initialised before use. - The Elements of Programming Style (Kernighan & Plauger) signature.asc Description: PGP signature
Re: git-dpm: remove a patch
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 FCAC 3C4E 599F »Time flies like an arrow, fruit flies like a Banana.«
Re: git-dpm: remove a patch
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
Re: git-dpm: remove a patch
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 signature.asc Description: This is a digitally signed message part.
git-dpm: remove a patch
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) signature.asc Description: PGP signature
