I'm thinking of integrating the latest standalone ooDialog code into
main/trunk for 5.0.
ooDialog standalone code (which should be 4.2.4 with some delta to the last
released 4.2.4 standalone-preview) has not yet been branched and is still
nmake-based (not CMake). I do not intend to convert / maintain it, but I'm
thinking of merging the 4.2.4 trunk back into main/trunk. ooDialog docs in
main/trunk are already at the 4.2.4 level, while main/trunk ooDialog code
is still at 4.2.3.
Merging will have to be done carefully, because different changes seem to
have been made to both trunks.
What's the suggested SVN command to merge back ooDialog-standalone code
into main/trunk, keeping its SVN revision history?
Rick, you said SVN gave you fits, when you merged the "address with"
changes back into trunk .. what are the pitfalls to avoid?
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Oorexx-devel mailing list
Oorexx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oorexx-devel
