Message: previous - next
Month: August 2012

Re: [trinity-devel] cups commits to backport/test in 3513-sru/tdelibs

From: Slávek Banko <slavek.banko@...>
Date: Wed, 15 Aug 2012 05:40:32 +0200
On Tuesday 14 of August 2012 21:56:57 David C. Rankin wrote:
> On 08/14/2012 10:11 AM, Slávek Banko wrote:
> > David,
> >
> > thank you for testing. Patch for v3.5.13-sru you adjust properly. Just a
> > small note: I will use patches so divided, as were the original commits -
> > to maintain information about the original git hashes, which was made of
> > cherry-pick.
> >
> > Slavek
> I think that is the best idea. I didn't know if 'cherry-pick' would work in
> this case since there was a 'tde'/'kde' difference in the commits as well
> as there being a 5 line context difference in the patch file. (I just don't
> know how cherry-pick works) If you can cherry-pick it, that is much better
> than another patch.
> Let me know when they are available and I will test the tdelibs build
> again.

As you correctly assume, git cherry-pick would fail due to renaming of file 
names and also texts within files. Therefore, even I not use directly git 
cherry-pick, but using the git show to save a patch, make the necessary 
adjustments and then make a commit as it was a cherry-pick.