<div dir="ltr">Mondrian developers,<div><br></div><div style>I had some questions related to the management of the master and release branches. From what I can tell, master is used for 3.5 development, and there's a 3.5 branch with 3.5.x branches attached to it (although 3.5.6-R isn't actually in that branch?).</div>
<div style><br></div><div style>However, I can't quite figure out the connection between the master and 3.5 branch. I'd expect 3.5 to be in master's history, but it seems they've diverged from each other a rather long time ago, and cherry picking is what's used to keep 3.5 up to date? Is that process as manual as it appears from the outside?</div>
<div style><br></div><div style>The question I'm actually trying to answer, though, is:</div><div style>-given a snapshot revision of master, what mondrian release does it "represent"?</div><div style><br></div>
<div style>for example:</div><div style><br></div><div style>right now, master is 3.5.6 + everything committed since 6e93b2861a ("Augments the default size of CellBatchSize"), but in 3.5 that commit is actually 56801db537. So given the current head revision of ab255ab58c, it's not apparent to me how to look at the history and say "oh, 3.5.6 was the most recently released version, and its branch diverges from master at 6e93b2861a".</div>
<div style><br></div><div style>I've noticed the relatively recent addition of tags & hashes to RELEASE.txt, but with none of those hashes in the master branch history, I'm still a little confused on how best to answer my question. Any suggestions/explanations?</div>
<div style><br></div><div style>Thanks,</div><div style>-Joe</div></div>