<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>On Feb 19, 2009, at 1:42 AM, Martin Aspeli wrote:</div><blockquote type="cite"><div class="gmail_quote"><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">When merging keep in mind that you should not modify any branches that<br> are used by Plone 3.2 (or older versions). That might mean you will have<br> to create a new maintenance branch for Plone 3.x and update plonenext<br> 3.2 and plone-coredev.</blockquote><div><br>We really ought to have some kind of map/script to tell us which branches are used by which versions.<br></div></div></blockquote></div><div><br></div><div>This is already part of plonenext. See <a href="http://svn.plone.org/svn/plone/plonenext/3.2/etc/sources">http://svn.plone.org/svn/plone/plonenext/3.2/etc/sources</a> for 3.2 and <a href="http://svn.plone.org/svn/plone/plonenext/3.3/etc/sources">http://svn.plone.org/svn/plone/plonenext/3.3/etc/sources</a> for 3.3</div><div><br></div><div>Hanno, any advice on forward-porting changes that are not compatible with Plone trunk? e.g. the locking stuff in PLIP 240 which uses some KSS for supporting inline editing (I suppose the correct answer is to create a new branch of the package for Plone trunk and omit the parts that are no longer relevant)</div><div><br></div><br><div apple-content-edited="true"> <span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div><div>David Glick</div><div>Web Developer</div><div>ONE/Northwest</div><div><br></div><div>New tools and strategies for engaging people in protecting the environment</div><div><br></div><div><a href="http://www.onenw.org">http://www.onenw.org</a></div><div><a href="mailto:davidglick@onenw.org">davidglick@onenw.org</a></div><div>work: (206) 286-1235 x32</div><div>mobile: (206) 679-3833</div><div><br></div><div>Subscribe to ONEList, our email newsletter!</div><div>Practical advice for effective online engagement</div><div><a href="http://www.onenw.org/full_signup">http://www.onenw.org/full_signup</a></div><div><br></div></div></div></span></div></span></div></span><br class="Apple-interchange-newline"></div></span><br class="Apple-interchange-newline"> </div><br></body></html>