• Share
  • Email
  • Embed
  • Like
  • Save
  • Private Content
Bazaar: DVCS for Human Beings!
 

Bazaar: DVCS for Human Beings!

on

  • 1,545 views

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

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

Statistics

Views

Total Views
1,545
Views on SlideShare
1,542
Embed Views
3

Actions

Likes
1
Downloads
21
Comments
0

2 Embeds 3

http://www.geekagenda.it 2
http://www.slideshare.net 1

Accessibility

Categories

Upload Details

Uploaded via as Apple Keynote

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

Bazaar: DVCS for Human Beings! Bazaar: DVCS for Human Beings! Presentation Transcript

  • Bazaar DVCS for Human Beings!
  • another Version Control System?!?!
  • started in 2004 as arch fork
  • Martin Pool released Bazaar 1.0 in 2005
  • Flexible
  • Different Workflows
  • Solo Project
  • bzr init-repo my.repo
  • cd my.repo bzr init my.main
  • cd my.main “code” “code”
  • bzr add bzr commit -m "First import"
  • “code” “code”
  • bzr commit -m "New Feature"
  • bzr commit --author "jrey@example.com" --author "jdoe@example.com"
  • Mistakes happen
  • bzr revert filename
  • bzr commit -m “Fix bug 11”
  • (damn! wrong bug number)
  • bzr uncommit
  • bzr commit -m “Fix bug 1”
  • Centralized Workflow init repo
  • push
  • bzr push ftp://host/bzr/PRJ/trunk
  • Prefix Description file:// Filesystem sftp:// SecureFtp bzr:// Bazaar smart ftp:// server Passive Ftp http:// Read-only
  • checkout
  • commit
  • update
  • Online-Offline Workflow checkout checkout
  • local commit
  • bzr commit --local
  • unbind commit bind
  • Decentralized Shared Mainline Workflow mainline branch branch
  • local commit local commit
  • mainline merge merge push push
  • Decentralized Gatekeeper Workflow mainline read only branch
  • local commit
  • local merge
  • merge request
  • merge
  • Branches
  • Branches bzr branch URL [directory]
  • Branches bzr branch M:/cool-trunk
  • Branches bzr branch / sftp://bill@host/repo/prj
  • A directory tree is the branch branch
  • Merge
  • Merge cd branch_dir bzr merge
  • Merge merge push
  • 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
  • Resolving Conflicts foo.BASE foo.OTHER foo.THIS
  • bzr remerge --weaver foo
  • Clients TortoiseBzr
  • Eclipse
  • Bzr Explorer
  • Conclusions
  • Why Switch to Bazaar
  • no server process
  • merge that just works