Hi Brian, On Mon, Apr 04, 2016 at 04:35:52PM +1000, Brian May wrote: > 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!
This message suggests you to use --allow-revert — I believe it's what you need. From the manpage: --allow-revert Usually reverting to an old state of the patched branch is not allowed, to avoid mistakes (like having only pulled the Debian branch and forgot to run checkout-patched). This option changes that so you can for example drop the last patch in your stack. -- Dmitry Shachnev
signature.asc
Description: PGP signature
