On Wed, 1 Feb 2012 06:44:27 -0800 (PST) "Edward K. Ream" <[email protected]> wrote:
> There was a very strange bzr error when trying to merge my recent work > with Brian's with qtGui.p. Something about not being able to change > history. When I created the new branch I set it up so you can't bury other people's commits - do you remember the exact message you saw? It shouldn't lead to the need to merge anything by hand though, basically you just need to merge your changes into the trunk, instead of merging the trunk into your changes. Unrelated - I duplicate Kent's findings with tracebacks from rev 4961-4964. Cheers -Terry -- 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.
