[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

dropping top patch with git-dpm



Seems this isn't as easy as I hoped.

brian@prune:~/tree/debian/python-modules/django-guardian$ git-dpm checkout-patched
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
Updating outdated 'patched'...
Switched to branch 'patched'
You are now in branch 'patched'
brian@prune:~/tree/debian/python-modules/django-guardian$ git reset --hard HEAD\^
HEAD is now at 2e72565 Remove nonlocal image for Travis-ci.
brian@prune:~/tree/debian/python-modules/django-guardian$ git-dpm update-patches
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
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!

master is not the checked out again, meaning the change I made was lost.

Will keep fiddling.
-- 
Brian May <brian@linuxpenguins.xyz>
https://linuxpenguins.xyz/brian/


Reply to: