Merging the sax and graph-world branches into the sax-graph branch created a so-called "criss-cross" branch. Not ideal, but it couldn't be helped.
I learned from experience (i.e., the hard way) that merging A into B is *not* the same as merging B into A. Unless there are conflicts, merging A into B replaces B's code with A's code. Creating the sax-graph branch was "interesting". There was quite a bit of manual work involved. I am now looking ahead to what will be involved in merging the sax- graph branch into the trunk. Extreme care will be needed. I've just done a trial merge as follows: 1. Create a branch from the trunk called trial-trunk. 2. Merge the latest sax-graph branch into the trial-trunk branch. This has highlighted several files that can be copied from the trunk to the sax-graph branch, namely 'install' and 'test/testAtPopup.leo' I did so, then pushed those files to the sax-graph branch. The trial merge showed that many files were changed. When it comes time to do the actual merge into the trunk, every such change will have to be examined to make sure there are no reversions. Obviously, this is an error-prone process, but I see no way of automating it. Attention to diffs will be essential. Edward --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en -~----------~----~----~----~------~----~------~--~---
