--- On Wed, 6/16/10, thyrsus <[email protected]> wrote:
> Thanks. Let me rephrase to be sure I've got it: > > cd trunk > bzr pull > cd ../root_update > bzr pull > * do work * > bzr commit > cd ../trunk > bzr pull > bzr merge ../root_update > bzr commit > bzr push That looks correct. You can do as many pull/merge / commit cycles in root_update as you want before the merge back into trunk, and all the commits you did in root_update will show up as sub-commits of the one push to launchpad. Also if the directory that contains trunk and root_update is created with `bzr init-repo` it will be a shared repository and trunk and root_update will share a lot of the files normally stored in .bzr - they'll be stored in common in ../.bzr. Saving drive space doesn't usually matter these days, but it is much faster if you want to branch within that parent dir, say to root_update_risky_experiment or something. But the sequence you have above is the critical bit for not making commits from the trunk on launchpad into sub-commits of your commits. 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.
