On Tue, 22 Apr 2008 10:08:27 -0500 John Griessen <[EMAIL PROTECTED]> wrote:
> 4. Decide to go ahead with a merge at a time agreed by developers. > cd trunk > bzr pull > bzr merge ../leo-jg > (resolve any conflicts) > bzr commit -m "leo-jg changed install docs" > bzr push My understanding is that you don't pull and push on a checkout, you update and commit. `bzr help checkouts` - update replaces pull, and does basically the same thing, but because its a checkout and not a branch, commit commits on both the local and remote repositories, if either fails, neither happens. 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 -~----------~----~----~----~------~----~------~--~---
