newbie questions about commit/push

[Damien Moore]

Hi folks,

I've just started playing around with Bazaar for some personal projects (currently solo but this will change in the future). I'm completely inexperienced with distributed version control other than the past few days of tinkering. I currently develop on multiple machines and often on the move without an internet connection. As such, the ability to make local commits is a blessing as is the support for conventional checkouts (bound branches(?)) from a central repository.



I'm a little confused about the following scenario:

1. Suppose I branch/checkout the main branch of the project from my central repository on my server to a local machine.

2. Over the course of a day I make several local commits (using either "bzr commit" for a branch or "bzr commit --local" for a checkout) each corresponding to a new feature, although there could be some overlap in that I refine one of the features in later commits.

3. At the end of the day I push/commit the changes back to the server.



My questions: what gets pushed? just the current state of the local branch, the entire history of commits or something else. Does the answer depend on whether I branch or checkout? What I *usually* want is to have the entire commit history (including local commits) appearing in the main repository branch, but I could see how this would get funky with multiple people making commits (e.g. I locally commit feature 1 then feature 2 then feature 3 over the course of a day. But in the meantime joe pushes changes that create a conflict with feature 2. I update to his changes and resolve the conflict in a 4th local commit, but then can I only push my first and last commits to the server because the others are conflicted?)



Appreciate any responses...



regards,

Damien

_______________________________________________
Join Excite! - http://www.excite.com
The most personalized portal on the Web!