<HTML><BODY style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space; ">Sean,<DIV><BR><DIV><DIV>On 6 Jul 2005, at 13:47, sean finney wrote:</DIV><BR class="Apple-interchange-newline"><BLOCKQUOTE type="cite"><DIV style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; ">On Wed, Jul 06, 2005 at 08:35:13AM +0100, Ton Voon wrote:</DIV> <BR><BLOCKQUOTE type="cite"></BLOCKQUOTE></BLOCKQUOTE></DIV><DIV><BLOCKQUOTE type="cite"><BLOCKQUOTE type="cite"><DIV style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; ">Sean, you didn't answer the question re: recent changes to HEAD for <SPAN class="Apple-converted-space"> </SPAN></DIV><DIV style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; ">the 1.4.1 release. Do we need to patch the r1_4 branch?</DIV> <BR></BLOCKQUOTE><DIV style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; min-height: 14px; "><BR></DIV><DIV style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; ">yes, for at least all of the changes that i've committed.<SPAN class="Apple-converted-space"> </SPAN>i'll go</DIV><DIV style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; ">back through the cvs log and apply them to r1_4 in the next few days.</DIV></BLOCKQUOTE></DIV><FONT class="Apple-style-span" color="#0000DD"></FONT><DIV><FONT class="Apple-style-span" color="#0000DD"><BR class="khtml-block-placeholder"></FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD">You going back through all the fixes you've already done to HEAD is what I am trying to avoid.</FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD"><BR class="khtml-block-placeholder"></FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD">I think we generally agree. But to make it worse, I've just taken a look and the branch is actually called r1_4-patches. Sigh. My fault for the inconsistency. </FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD"><BR class="khtml-block-placeholder"></FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD">Can we get agreement on the names? I suggest rx_y_z as the static tag for a release, with bx_y (uncreated yet) as the branch name. So, in two weeks, a r1_4_1 will be created.</FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD"><BR class="khtml-block-placeholder"></FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD">I suggest ignoring r1_4-patches. HEAD is the only active branch at the moment, with all the 1.4.x stuff now. r1_4_1 will be created from HEAD. That's saved you some work. Let's go a few more months in this state. When we are ready for major changes, we'll create a b1_4 and HEAD becomes the 1.5 development train.</FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD"><BR class="khtml-block-placeholder"></FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD">Ton</FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD"></FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD"></FONT></DIV><DIV><FONT class="Apple-style-span" color="#0000DD"></FONT></DIV></DIV></BODY></HTML>