On Mon, 2009-11-30 at 23:19 -0400, bulia byak wrote:
Probably a stupid question, but can I do updates and commits without creating a "branch"?
Yes. A branch is a generic term here, not necessarily meaning a divergence from trunk.
I'm not against branches in principle, but with SVN I was doing compulsive updates many times a day. Now, whenever everything changes, I must commit someone's updates into my branch, and think up a commit message for that, even if I have no idea what those changes were. That's a bit much for me, frankly.
Probably want you want is to bind your branch to trunk. What that means is that you'll commit to trunk and then update, it makes things work very much like SVN. You always have to be connected, and you can't commit if someone else has changed trunk.
$ bzr branch lp:inkscape $ cd inkscape $ bzr bind lp:inkscape <do work> $ bzr commit <error, someone else has changed things> $ bzr update <check all is okay> $ bzr commit
Also, if I do a commit of merge changes into my branch, then do some changes of my own, and then push it all to the trunk - will my merge commits be pushed as well? If not why?
Yes.
--Ted