Bazaar Workflow

[Philippe Lhoste]

Daed Lee wrote:
> Essentially, when pulling changes from the master repository,
> Mercurial prevents you from merging with uncommitted changes in your
> local working copy.

Bzr handles merges quite nicely, even on un-commited changes.
I did the following on a little test repository:

D:\Temp\TestBzr
 > bzr clone RunApp RunApps
Branched 4 revision(s).

D:\Temp\TestBzr
 > cd RunApp

D:\Temp\TestBzr\RunApp
 > bzr commit -m "Removed dead, commented out code"
Committing to: D:/Temp/TestBzr/RunApp/
modified AppDesc.java
modified RunApp.java
Committed revision 5.

Go to RunApps, edit RunApp.java

D:\Temp\TestBzr\RunApps
 > bzr ci -m "Removed auto-generated tags/comments"
Committing to: D:/Temp/TestBzr/RunApps/
modified RunApp.java
Committed revision 6.

D:\Temp\TestBzr\RunApp
 > bzr push ..\RunApps
All changes applied successfully.
Pushed up to revision 5.

Go to RunApps, edit RunApp.java (non conflicting changes)

D:\Temp\TestBzr\RunApp
 > bzr pull ..\RunApps
  M  RunApp.java
All changes applied successfully.
Now on revision 6.

My un-commited file have been merged automatically and correctly.

I appreciate the various workflows of Bazaar, fitting (nearly) 
everyone's taste and habits.
And funnily I had the same grippe as you on Mercurial's use of clones:
Mercurial practices: use with IDEs and scalability 
<http://stackoverflow.com/questions/403279/mercurial-practices-use-with-ides-and-scalability>

-- 
Philippe Lhoste
--  (near) Paris -- France
--  http://Phi.Lho.free.fr
--  --  --  --  --  --  --  --  --  --  --  --  --  --