On Tue, Aug 28, 2018 at 3:26 PM Erich Steinböck <erich.steinbo...@gmail.com>
wrote:
> 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.
>
I think this is a good idea.
>
> 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?
>
I used this guide when I did the merge:
http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html
The first step of merging changes back into the trunk seemed to miss
updates on some files, and the pattern made no sense, such as missing
portions of individual commits. I never figured out what the problem was,
but I had to fix up a lot of things manually. I found it useful to do an
SVN diff between the two branches and take a close look at the deltas to
make sure that nothing was getting backed out from the trunk version when
the merge happened. It helped that I was familiar with all of the changes,
not a luxury we have with the oodialog code.
I don't know if this is a factor or not, but that branch is very old and
the newer SVN branch merge features might predate that branch getting
taken, so it might not have all of the information used for tracking the
merges. It might be impossible to keep the revision history.
There's a lot of information available by doing "svn help merge".
>
> Rick, you said SVN gave you fits, when you merged the "address with"
> changes back into trunk .. what are the pitfalls to avoid?
>
SVN diff is your friend for double checking that something is not
accidentally backed of. Generate an SVN diff for both branches so you know
what the state of everything is before you start merging, then use that
information to double check everything before committing.
Rick
>
> ------------------------------------------------------------------------------
> 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
>
------------------------------------------------------------------------------
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
