On Aug 28, 1:28 pm, "Edward K. Ream" <[email protected]> wrote:
> This is getting bad.
>
> On my machine, the trunk and 46-maint branches are clearly different.
>
> But when I do a bzr merge <path to 46-maint> bzr says "nothing to do".
>
> Hmm. Maybe its time for a reboot :-)
Looking at bzr qlog, it appears that something went drastically wrong
at rev 2341: recommit after merging with 46-maint branch.
The code that disables caching in leoAtFile.py disappeared. That
wouldn't be so bad, but bzr qlog doesn't show where it disappeared!!!
I can see that the code was inserted at rev 2264.2.13, but at rev 2241
the code is gone but **there is no diff to show that it is gone**.
I'm starting to lose faith in bzr.
It's not clear how to recover from this mess. I may have to ask the
bzr people for help.
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
-~----------~----~----~----~------~----~------~--~---
