On Mon, Aug 2, 2010 at 10:08 AM, Edward K. Ream <[email protected]> wrote:
>> * provide a means to reconcile conflicts within an XML file in a >> visually easy to understand format. > > I'm glad you mention this. There is an analogy with inc-lint. Just > as with xml files, ast's (parse trees) can not be used in any > convenient way to do diffs. As perhaps a more compelling example, consider "Recovered Nodes" info. The top-level node now shows a diff, and the two children show the "before" and "after" version of the code. This should be enough, but I still find this information far from being truly helpful. So instead of handling diffs, it would be best to eliminate them completely. The ekr_leoPy.leo scheme may do this. Edward P.S. Having "backup" files in the bzr repository, like ekr_clones.txt and ekr_leoPy.leo will complicate the distribution slightly: we don't want to include these files in official distributions. But this seems like a reasonable price to pay for a much improved work flow. EKR -- 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.
