Okay, I'm good with that.

--
Mark Miesfeld


On Wed, Dec 11, 2013 at 6:57 AM, Rick McGuire <object.rexx@gmail.com> wrote:
yeah, we can do the back copy on a doc-by-doc basis when the time comes.  I'm ok with that.  I might even try doing a merge first rather than a replacement to maintain the update histories. 

Rick


On Wed, Dec 11, 2013 at 9:42 AM, Mark Miesfeld <miesfeld@gmail.com> wrote:

On Wed, Dec 11, 2013 at 4:38 AM, Rick McGuire <object.rexx@gmail.com> wrote:
Maintaining both trunk and 4.2.0 branches of the docs are starting to become a bit of a pain given the number of updates.  David only updated the 4.2.0 branch for his inheritance table work, so they are already out of sync.  I propose that for now, we only update the 4.2.0 branch, and then copy that branch back into trunk once 4.2.0 ships.  Can we agree on that?

I'm okay with that.  

The ooDialog docs in trunk are already moved on to the next version.  So, the ideal thing for me would be that they not be touched when the 4.2.0 branch is copied back to trunk.  That would mean that you couldn't just copy docs back, you'd have to do the individual subdirectories.  

However, I think most of the other subdirectories are not changing.  If so, we could just copy docs/rexxref from the branch back to trunk and it wouldn't be any extra pain.

Otherwise, I can branch docs/oodialog and docs/oodguide off somewhere now and fix up trunk after you've merged the 4.2.0 branch back to trunk.

--
Mark Miesfeld


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Oorexx-devel mailing list
Oorexx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oorexx-devel



------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Oorexx-devel mailing list
Oorexx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oorexx-devel