<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div>Some thoughts -</div><div><br class="webkit-block-placeholder"></div>In theory, if there is no other svn activity between the time you merge trunk->devildog and<div>the time you merge devildog->trunk, then what you have in devildog after your</div><div>first merge should be exactly what you want in trunk when you're finished.</div><div>If you see any conflicts or difficulties, I think that would be your guide.</div><div><br class="webkit-block-placeholder"></div><div>Probably would be good to rsync your svn trees before/after each major step for safety.</div><div><br class="webkit-block-placeholder"></div><div>I remember one messy file renaming issue (ParseTreePrinter.java I think)</div><div>that confused one of the merges, perhaps that will reemerge when you merge back.</div><div><br></div><div>- Don</div><div><br class="webkit-block-placeholder"></div><div><div><div>On Mar 25, 2008, at 5:34 PM, Henry Minsky wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">Can everyone finish checking in to trunk what they need to tonight, and hold off any new checking in starting tomorrow morning until I sound<br>the all-clear. I'm going to do a last merge from trunk to devildog in the morning , and then try to merge it back to trunk.<br> <br clear="all"><br>-- <br>Henry Minsky<br>Software Architect<br><a href="mailto:hminsky@laszlosystems.com">hminsky@laszlosystems.com</a><br><br></blockquote></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; "><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><br class="Apple-interchange-newline">--</div><div><br class="webkit-block-placeholder"></div><div>Don Anderson</div><div>Java/C/C++, Berkeley DB, systems consultant</div><div><br class="webkit-block-placeholder"></div><div>voice: 617-547-7881</div><div>email: <a href="mailto:dda@ddanderson.com">dda@ddanderson.com</a></div><div>www: <a href="http://www.ddanderson.com">http://www.ddanderson.com</a></div><div><br class="webkit-block-placeholder"></div></div></span><br class="Apple-interchange-newline"></span><br class="Apple-interchange-newline"> </div><br></div></body></html>