A brief and introductory presentation about Bazaar, the distributed version control system build by Canonical ro manage Ubuntu development

1. Bazaar
DVCS for Human Beings!

2. another Version Control System?!?!

3. started in 2004 as arch fork

4. Martin Pool released Bazaar 1.0 in 2005

5. Flexible

6. Different Workflows

7. Solo Project

8. bzr init-repo my.repo

9. cd my.repo
bzr init my.main

10. cd my.main
“code” “code”

11. bzr add
bzr commit -m "First import"

12. “code” “code”

13. bzr commit -m "New Feature"

14. bzr commit
--author
"jrey@example.com"
--author
"jdoe@example.com"

15. Mistakes happen

16. bzr revert filename

17. bzr commit -m “Fix bug 11”

18. (damn! wrong bug number)

19. bzr uncommit

20. bzr commit -m “Fix bug 1”

21. Centralized Workflow
init repo

22. push

23. bzr push
ftp://host/bzr/PRJ/trunk

24. Prefix Description
file:// Filesystem
sftp:// SecureFtp
bzr:// Bazaar smart
ftp:// server
Passive Ftp
http:// Read-only

25. checkout

26. commit

27. update

28. Online-Offline Workflow
checkout checkout

29. local commit

30. bzr commit --local

31. unbind
commit
bind

32. Decentralized Shared Mainline Workflow
mainline
branch branch

33. local commit local commit

34. mainline
merge
merge push
push

35. Decentralized Gatekeeper Workflow
mainline
read only
branch

36. local commit

37. local merge

38. merge request

39. merge

40. Branches

41. Branches
bzr branch URL [directory]

42. Branches
bzr branch M:/cool-trunk

43. Branches
bzr branch /
sftp://bill@host/repo/prj

44. A directory tree is the branch
branch

45. Merge

46. Merge
cd branch_dir
bzr merge

47. Merge
merge
push

48. 3-way merging
A B C Result Comment
x x x x unchanged
x x y y line from C
x y x y line from B
x y z ? conflict

49. Resolving Conflicts
foo.BASE
foo.OTHER
foo.THIS

50. bzr remerge --weaver foo

51. Clients
TortoiseBzr

52. Eclipse

53. Bzr
Explorer

54. Conclusions

55. Why Switch to Bazaar

57. no server
process

58. merge that
just works