Page 1 of 1

Are commits from 7.2.6 in the 7.3 branch?

Posted: 26.10.2019, 19:11
by aehimself
I saw that 7.2.6 was released and there are fixes / features which I'd like to have. Unfortunately though I have to stay on 7.3 because of the oracle codepage buffer size thingie :)

So the question is... If I pull a fresh copy of 7.3, will the 7.2.6 commits be included? Are there a (simple) way to check this by myself?

Thanks!

Re: Are commits from 7.2.6 in the 7.3 branch?

Posted: 27.10.2019, 12:42
by marsupilami
aehimself wrote:I saw that 7.2.6 was released and there are fixes / features which I'd like to have. Unfortunately though I have to stay on 7.3 because of the oracle codepage buffer size thingie :)
You don't have to stay with the 7.3 branch. Your fix was merged to Zeos 7.2 in Rev. 6017. I just forgot to include this in the release notes.
aehimself wrote:So the question is... If I pull a fresh copy of 7.3, will the 7.2.6 commits be included? Are there a (simple) way to check this by myself?
Zeos 7.3 currently is the main developmet branch. All fixes go there first and are tested there first. If you want to ckeck for a single fix, the commit log is your friend. EgonHugeist merges the commit log messages too when he merges changes from Zeos 7.3 to zeos 7.2.

Re: Are commits from 7.2.6 in the 7.3 branch?

Posted: 28.10.2019, 00:26
by aehimself
marsupilami wrote:Zeos 7.3 currently is the main developmet branch. All fixes go there first and are tested there first.
That's what I'd do, that's what I thought. I just felt it better to ask :)

Cheers!