On Fri, Aug 28, 2009 at 3:47 PM, Ville M. Vainio <[email protected]> wrote:
> > On Fri, Aug 28, 2009 at 10:43 PM, Edward K. Ream<[email protected]> > wrote: > > > It's annoying that I can't merge a branch that has already been merged, > but > > I suppose I can do nothing about that. > > Merge tracking is the whole point of distributed version control > systems :-). If the merge is the "last" thing you did, you can branch > from the older revision (bzr branch -r), and do the merge on that. Well, I'm thoroughly unhappy. I was able to see some reversions due to clones in leoProjects.txt not being in synch. It was a big mistake not to pay more attention to that file. I can now load leoPy.leo and force a write of all files three times in a row with no changes. That wasn't true before. I in the process of merging the one-node branch into the trunk by hand. This involves a lot of careful attention to diffs, but the process is converging to what looks right. All unit tests pass with g.unified_nodes = False, and I'm about to run them with g.unified_nodes = True. 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 -~----------~----~----~----~------~----~------~--~---
