[SSSD] [PATCH] DEBUG macro refactoring - 1.11 backport

Lukas Slebodnik lslebodn at redhat.com
Mon May 5 19:36:46 UTC 2014


On (01/05/14 00:51), Nikolai Kondrashov wrote:
>On 04/30/2014 11:39 PM, Nikolai Kondrashov wrote:
>>On 04/30/2014 11:02 PM, Lukas Slebodnik wrote:
>>>I realised that sssd cannot be built after applying the 5th and the 6th patch.
>>>0005-Make-DEBUG-macro-definition-variadic.patch
>>>0006-Make-DEBUG-macro-invocations-variadic.patch
>>>It is fixed by the 7th patch.
>>>0007-Fixup-DEBUG-macro-invocations-update.patch
>>>
>>>Now, it does not worth to modify patches, because the same problem is in
>>>master. I should have reviewed them. Just for the record.
>>>It is better to modify patches even if they are generated by script.
>>>It causes problem with bisecting. Sometimes problem can be solved easily.
>>>In my opinion, we should be able to compile each commit.
>>
>>I understand the benefit of "every patch builds" approach and would support a
>>policy requiring that.  Originally, I made them separate to simplify review
>>and left the squashing decision to maintainers. Here, I simply cherry-picked
>>them the way they were merged to (again) make it simpler.
>
>One thing, though: having the script-generated patches separate certainly made
>cherry-picking easier and faster.
>
The patches were pushed, so we can continue with this discussion.

The only way how to make chery-picking easier is to have better merging
algorithm in version control syste. The script generated patches solve problem
with back porting changes to diverged branches.

I am not against script generated patches. I like scripting, it simplifies my
life. My idea was to have script which will fix(convert) 99% of cases and
the last 1% of corner cases can be solved easily by hand.
Sometimes it is easier to fix the last 1% of problems by hand rather than
spending days with creating a robust conversion script. But the main point is
to include hand made changes to the generated patch and not to the separate
patch. With this approach work is simplified with script and we don't lost
benefit "every patch builds"

LS



More information about the sssd-devel mailing list