On Mon, Mar 24, 2008 at 10:13 AM, Terry Brown <[EMAIL PROTECTED]> wrote:
> > On Mon, 24 Mar 2008 06:16:20 -0500 > "Kent Tenney" <[EMAIL PROTECTED]> wrote: > > > > > Terry, please fix this directly in the trunk. Thanks. > > > > > > Not sure how I'd do that. Merge the trunk into (my local copy of) > > > my branch and then push it back? I can do that? > > > > My understanding is that you merge to Edward's branch from your > > branch. Edward reviews and resolves conflicts if any, commits. > > But what does that mean? I would do the following: - Pull the trunk to a new branch mkdir myTrunk cd myTrunk bzr pull http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk - Replace the changed file/files in myTrunk with your new version. Just do a file copy. - Run all unit tests if you change any of Leo's core files. - Commit and push bzr commit -m "my log entry" bzr merge bzr commit -m "commit after merge" # if needed bzr push bzr+ssh://<your-name>@ bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk I think this is about right. 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 -~----------~----~----~----~------~----~------~--~---
