On Apr 14, 2:41 pm, Terry Brown <[EMAIL PROTECTED]> wrote: > Now I think about it I fear pushing from my branch to > the trunk was monumentally stupid, I was confusing the > effects of merge with pull.
Usually, if I push and there have been other changes in the trunk, I get a message that I should merge first. If you had done that, the worst that could have happened, it seems to me, is that you would have gotten conflicts. Can you tell us in more detail what you did? It would help me make the same mistake ;-) The only thing I can think of that would have caused the chaos that ensued was a push --overwrite. Did you do that? The other part of the problem was that a lock got stuck. I tried to break the lock, but I broke the wrong one :-) In short, I'm thinking there may be a bzr bug involved. The more detail you can provide the better. And *please* do not worry about "causing" the problem. It was easily solved, and we shall all learn from it. 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 -~----------~----~----~----~------~----~------~--~---
