<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><br><div><div>On 22 Aug 2016, at 17:43, Roland Haas <<a href="mailto:rhaas@illinois.edu">rhaas@illinois.edu</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">Hello all,<br><br><blockquote type="cite">There was also a discussion of the piraha-everywhere branch. Frank<br>reported that it worked for him without trouble for his non-ET thorns.<br>Peter has privately reported the same to me. Frank said he plans to<br>go over the patch and understand it in more detail when he gets back<br>to the office.<br></blockquote>Right there was, sorry.<br><br>On the release-branch issue:<br><br>I tried this and unfortunately it is exactly as Erik described it: git<br>finds conflicts if there are commits in only some of the release<br>branches but not in the others.<br><br>Tags seems less nice to use since they don't allow for a git pull (at<br>best I guess one has to do another git checkout) which is one of the<br>interesting parts.<br><br>In this light a "release" tag for the manifest maybe the simplest<br>solution.<br></blockquote><div><br></div><div>Tags also cannot be moved; that is the point - they always point to the same version. </div></div><br><div apple-content-edited="true">
<div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div>-- </div><div>Ian Hinder</div><div><a href="http://members.aei.mpg.de/ianhin">http://members.aei.mpg.de/ianhin</a></div></div></div></div></div>
</div>
<br></body></html>