On Fri, Aug 28, 2009 at 9:28 PM, Edward K. Ream<[email protected]> wrote:
> 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". It seems you merged the stuff already. Nothing needs to "change" to create an entry in the merge history - if you do "bzr merge", "bzr revert" all the files, and do "bzr ci", you would still have "merged" the branches. -- Ville M. Vainio http://tinyurl.com/vainio --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
