On Wed, Aug 28, 2013 at 09:44:56PM +0200, Bernhard R. Link wrote: > * Paul Elliott <pelli...@blackpatchpanel.com> [130828 06:25]: > > What is the official git-dpm way to delete a patch > > that is not wanted anymore? The public branches > > have been pushed and so cannot be changed, only added > > to. > > > > The way I have been doing it is > > git-dpm checkout-patched #checkout patched branch > > rebase -i #remove commit that coresponds to the patch > > git-dpm update-patches #go back to master with patch deleted in new > > commits > > > > > > Is this the correct way to remove an unwanted patch? > > Yes, it is indeed the correct one. (Except when you drop the last patch > then you need a --allow-revert to update-patches to avoid the > child-proof).
In that case, I have found another bug. If you have a patch that deletes a file, and then delete that patch, the file should reappear. It does on the patched branch, but when update-patches happens the deleted file does not reappear on the master branch. If you do a dpkg-source -b on the master branch directory, dpkg-source notices the discrepancy of the deleted file and gives you a warning. I have an example of this that I can send you on request. -- Paul Elliott 1(512)837-1096 pelli...@blackpatchpanel.com PMB 181, 11900 Metric Blvd Suite J http://www.free.blackpatchpanel.com/pme/ Austin TX 78758-3117 --- "Encryption works. Properly implemented strong crypto systems are one of the few things that you can rely on. Unfortunately, endpoint security is so terrifically weak that NSA can frequently find ways around it." Edward Snowden
Description: Digital signature
_______________________________________________ Git-dpm-user mailing list Gitfirstname.lastname@example.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/git-dpm-user