I think push is inherently dangerous - you should only ever need to use
it once on a launch pad branch, to create the branch.
After that I'd use a bound checkout, so that when you commit bzr checks
for changes and refuses to do anything until they're merged.
bzr init-repo leo.repo
cd leo.repo
bzr checkout
bzr+ssh://[EMAIL PROTECTED]/%7Eleo-editor-team/leo-editor/trunk
(all that on one line, creates local copy of trunk)
branch trunk myNewCode
(very fast because of shared files in leo.repo, at this point directory
structure is:
leo.repo
trunk
leo
core
plugins
...
myNewCode
leo
core
plugins
...
(hack / commit / hack / commit / etc. in myNewCode)
if you want, probably a good idea:
bzr merge
http://bazaar.launchpad.net/%7Eleo-editor-team/leo-editor/trunk
in myNewCode to keep up with trunk.
When you're ready to commit changes to the trunk
cd trunk
bzr update
bzr merge ../myNewCode
(test)
bzr commit
this last line sends the changes to launchpad, but only if nothing's
changed there.
There are other orders which have the same effect - i.e. using commit
rather than push to send things to launch pad.
Cheers -Terry
On Tue, 3 Jun 2008 19:26:02 -0700 (PDT)
TL <[EMAIL PROTECTED]> wrote:
>
> The bzr FAQ does a nice job describing the work flow based on a
> "Hosted" branch which is peer reviewed and then merged into the
> trunk. What about small code changes or documentation changes?
> Should these type of changes also follow the peer-reviewed work flow
> described in the FAQ or should there be an alternate work flow that
> enables developers to update the trunk directly from a local branch?
> Section 6.2.5 of the Bazaar User Guide discribes a workflow that
> should do the job but I had problems with it today when I tried to
> update the trunk with a simple fix to the mod_tempfname.py plugin
> file.
>
> 6.2.5 Merging a feature into the trunk
> bzr pull
> bzr merge ../X-fix-123
> (resolve any conflicts)
> bzr commit -m "Fixed bug #123"
> bzr push
> >
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
