Terry Brown wrote:
> On Mon, 21 Apr 2008 19:07:56 -0500
> John Griessen <[EMAIL PROTECTED]> wrote:
>
>> Until newbies know enough about bzr, they need to do
>>
>> bzr branch URL-of-central-repos local-dir-for-branch
>
> Bear in mind though that that creates the need to push back to the
> launchpad branches.
Sure. And you can have several local branches, so are you suggesting
checkout to a separate branch named differently than trunk? That's what I
think is
least confusing.
How do you do a merge to trunk if you have a branch with changes no one else
has worked on yet?
I am thinking of having two or more local checkouts or branches in my local bzr
repos.
Does that go like:
1. Checkout trunk.
bzr checkout
http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk
2. Create your branch leo-jg, (this one is not bound to central repos, but
remembers it came from there)
bzr branch trunk leo-jg
modify it and commit changes, and keep it up to date re: trunk by
merges from trunk.
bzr merge
(resolve any conflicts)
bzr commit -m "merged from trunk rev 355"
Rebase it if trunk has changed much. (Base it on rev 355 instead of
302)
3. Create merge directive files and review proposed changes against the
central trunk repos.
bzr send -o ../leo-jg.patch
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
That last push needs no argument and always goes to the right place, since the
branch was originally created
relative to trunk and that info is saved inside the branch.
So, is this a good workflow?
I like it.
One thing I have not figured yet is how to create a new branch at launchpad...
The above describes local branches that relate to trunk, not central branches
that relate to trunk,
but aren't merged yet....
John Griessen
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
