Re: dropping top patch with git-dpm

2016-04-04 Thread Dmitry Shachnev
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_OPT

Re: dropping top patch with git-dpm

2016-04-04 Thread Barry Warsaw
On Apr 04, 2016, at 05:33 PM, Brian May wrote: >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. When it works, it's magi

Re: dropping top patch with git-dpm

2016-04-04 Thread Brian May
Brian May 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-debia