Re: git-dpm: remove a patch

[Scott Kitterman <debian@kitterman.com>]

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

Attachment: signature.asc
Description: This is a digitally signed message part.