Brian May <br...@linuxpenguins.xyz> writes: > 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!
Ok, so as I expected, integrating a new upstream release resolved this issue for me. git-dpm import-new-upstream left me in the patched directory, and I was able to drop the last patch and then run git-dpm update-patches. Something to watch out for however. -- Brian May <b...@debian.org>
