Terry Brown wrote:
> 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.
> My understanding is that you don't pull and push on a checkout,
Ah, yes. When I change that in the write up it's:
=============================
workflow using local checkout of trunk,
along with a different named project in a local branch
that is not bound to central repos.
=============================
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 send this to the list if not huge, to
anyone that will test...
leo-jg.patch can be applied to any local branch based on trunk for
testing by:
cd dir-of-developer2-to-add-to-and-test
bzr merge leo-jg.patch
(test some functions, run unit tests?)
after doing some testing, developer2 can get rid of the patch
by:
bzr status, bzr diff, (see only patch differences) bzr revert
4. Decide to go ahead with a merge at a time agreed by developers.
cd trunk
bzr update
bzr merge ../leo-jg
(resolve any conflicts)
bzr commit -m "leo-jg changed install docs"
Step 4. changes the central repos, so it needs testing locally before you do it.
Step 4. is done in a different dir than you usually issue bzr commands in --
it's only for changing the central repos.
5. If the commit of step 4. resulted in some problems found later, the
developer of it can't fix it now,
they could use the reverse-cherrypick method which needs revision
numbers to do. Say the commit of step 4.
made rev. 366. You could remove that commit only by:
bzr merge -r 366..365
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
-~----------~----~----~----~------~----~------~--~---
