> Now when I do:
>
> $ git diff origin/master tf/stable
>
> I see some weird differences, I don't think the code is ok. You
> tried
> to merge it, right? That's the reason why I suggested diff-patch
> approach [1], to be sure that stable is exactly same as 0.5.0 as
> tagged in master.
Yes, I did do a merge instead of extract/patch. I don't have an
explanation for what shows up in that diff but if you look at the
files
or do a diff with their common ancestor (instead of between the branch
heads), they're the same.
They're not, e.g. see:
https://github.com/tflink/autoqa-devel/blob/stable/autoqa.spec#L94
That is a remnant of a merge that's displayed when diffing the branches, and it's
really included in that file.
I don't understand why preserving history isn't important,
why tagging
on stable is better or the lack of release branches. My lack of
understanding isn't enough to argue and delay 0.5.0's release, though.
The right code will end up being released.
Let's do it my way this time and we can develop better approaches in the future.
I'll send some explanation soon.