On 5/15/2013 5:42 PM, Shawn Heisey wrote:
Through a little detective work, I figured out that it would apply cleanly to revision 1351040 of trunk. When I then tried to do 'svn up' to bring the tree current, there were merge conflicts that will have to be manually fixed.
It applied also to that revision of branch_4x, and I think there were fewer merge conflicts there, too. It looks like you want 4x, so that's probably a good thing.
Thanks, Shawn --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
