On 2014-07-03 22:36:00 [-0400], Scott Kitterman wrote: > It looks like we won't have to change any of the rdepends. > > I attempted to revert the 0010 patch prior to adding > https://github.com/vrtadmin/clamav-devel/commit/78ee2250aeec46c91017c735712140d69474b903 > but failed. cherry-picked
> I decided to stop before I broke it, so I'd appreciate it if one of you could > have a look. > > What's the right process for reverting a patch using git-dpm do you think? > this is the second time I failed at it. What you did should work. But why apply a patch and then revert it? I did: - git dpm checkout-patched the patched source - git reset --hard HEAD~2 this goes two commits back. HEAD~1 would bring before after my patch before your revert. I would simply scrape of the revert commit. HEAD~1 again (which boils down to the HEAD~2) brings you before the patch I applied. Usually this kind of things (the rebase here I did) is bad because people that might have pulled from that branch will get screwed once they pull again before they reset to the remote branch. This is one here actually okay because the "patched-source" branch is created from scratch by dpm each time you ask for it. - git am for-the-new-patch applied - git dpm update-patches Got back to the unstable branch, the two "new" patches are gone the brand new one got the 10 number. > > Scott K Sebastian _______________________________________________ Pkg-clamav-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-clamav-devel
