On Friday, July 04, 2014 11:44:30 Andreas Cadhalpun wrote: > Hi, > > On 04.07.2014 09:14, Sebastian Andrzej Siewior wrote: > > 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/78ee2250aeec46c91017c7357 > >> 12140d69474b903 but failed.> > > cherry-picked > > They haven't reverted the SO version bump, yet. But I assume they will, > as there is no need for it anymore.
I talked to lattera about it and he's going to discuss it with his colleagues on Monday (today is a holiday in the US). > >> 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. > > This works if you want to remove the last patch. If the patch is > somewhere in the middle, just run: > git rebase -i upstream-unstable > > Then git will open your preferred editor with a list of commits since > upstream-unstable, i.e. all patches. Now you can just delete the line of > the patch you want to remove, save and close, and git will remove this > commit. > As Sebastian said, such a rebase should never be done on a published > branch, e.g. unstable, but is fine in a temporary branch like > patched-unstable. Thanks to both of you. Exactly the information a git newb like me needed. > > - 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. > > I just removed mention of the temporary patch from the changelog, as it > would be rather confusing. Thanks. I've just uploaded it. Scott K _______________________________________________ Pkg-clamav-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-clamav-devel
