On Jun 16, 6:45 pm, Terry Brown <[email protected]> wrote: > On Wed, 16 Jun 2010 15:03:21 -0700 (PDT) > > thyrsus <[email protected]> wrote: > > I saw some odd versions go by, and I'm wondering if my workflow might > > be at fault. What I *intend* to do (and may execute imperfectly) is > > > bzr pull > > * do work * > > bzr pull > > - if complaint about divergence, bzr merge > > bzr push > > > Am I breaking things? > > You're not breaking anything, but you're burying other people's commits in > your merges. This causes no real damage, but it's better to avoid it, > because it's easier to keep track of everything that's happened on the trunk > if commits aren't buried in merges. > > So you want two copies of the trunk, one which is an unaltered copy, and one > which is your working copy. Directory structure might look like this: > > leo.repo > trunk > root_update > > Do your work in root update, pulling, merging, and committing as you please. > When you're ready to push, make sure everything's committed in root_updates, > and then switch to your trunk directory, pull there (bound to succeed since > you're not altering things in there), and then merge root_update into your > local trunk, commit in trunk, and push from trunk. > > It's not really as much of a hassle as it sounds, although it does mean you > have to give a commit message for the commit in trunk, which, if you'd only > made one commit in root_update, is kind of redundant. > > The attached image shows the recent activity on the trunk. The three commits > by Edward which start "recommit after..." show the redundant log messages I > mentioned. > > Edward's merge commits only include his own commits as subcommits, whereas > your latest included his previous. It's not a big deal, just clearer if > avoided. There is a setting that Edward could apply to make it impossible to > bite the head of the trunk, as it were, but I don't know if that's really > necessary. > > btw, I'm sure whatever you're doing's very useful, but I've never used @root, > that's the only reason I'm not commenting. > > Cheers -Terry > > trunk.png > 172KViewDownload
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 Much appreciated. -- 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.
