documentation
.HELP!
Bazaar Documentation
Bazaar User Guide
Bazaar
previous page
next page
Navigation
next
previous
|
Home
|
Documentation
|
Table of Contents (2.2b1)
»
Bazaar User Guide
Introduction
Introducing Bazaar
Core concepts
Workflows
Getting started
Installing Bazaar
Entering commands
Getting help
Configuring Bazaar
Using aliases
Using plugins
Bazaar Zen
Personal version control
Going solo
Starting a project
Controlling file registration
Reviewing changes
Recording changes
Browsing history
Releasing a project
Undoing mistakes
Sharing with peers
Working with another
Branching a project
Merging changes
Resolving conflicts
Annotating changes
Team collaboration, central style
Centralized development
Publishing a branch
Using checkouts
Working offline on a central branch
Reusing a checkout
Team collaboration, distributed style
Distributed development
Organizing branches
Using gatekeepers
Sending changes
Miscellaneous topics
The journey ahead
Pseudo merging
Shelving Changes
Filtered views
Using stacked branches
Running a smart server
Using hooks
Exporting version information
A brief tour of some popular plugins
BzrTools
bzr-svn
Integrating Bazaar into your environment
Web browsing
Bug trackers
Appendices
Specifying revisions
Organizing your workspace
Advanced shared repository layouts
Configuring email
Serving Bazaar with Apache
Writing a plugin
Navigation
next
previous
|
Home
|
Documentation
|
Table of Contents (2.2b1)
»
previous page
start
next page
Menu
Homepage
Table of contents
Table of Contents (2.2b1)
What's New in Bazaar 2.2?
Improved conflict handling
Improved Launchpad integration
Notable plugin enhancements
Better documentation
Enhanced GUI clients
Further information
Bazaar User Guide
Introduction
Introducing Bazaar
What is Bazaar?
A brief history of version control systems
Central vs distributed VCS
Key features of Bazaar
Learning more
Core concepts
A simple user model
Revision
Working Tree
Branch
Repository
Putting the concepts together
Workflows
Bazaar is just a tool
Solo
Partner
Centralized
Centralized with local commits
Decentralized with shared mainline
Decentralized with human gatekeeper
Decentralized with automatic gatekeeper
Implementing a workflow
Getting started
Installing Bazaar
Linux
Windows
Other operating systems
Installing from scratch
Installing into site-wide locations
Running the development version
Running multiple versions
Entering commands
User interfaces
Using bzr
Common options
Getting help
Configuring Bazaar
Telling Bazaar about yourself
Configuration files
Rule-based preferences
Using aliases
What are aliases?
Defining aliases
Using the aliases
Rules for aliases
Using plugins
What is a plugin?
Where to find plugins
How to install a plugin
Alternative plugin locations
Listing the installed plugins
Popular plugins
Bazaar Zen
Grokking Bazaar
Understanding revision numbers
Hierarchical history is good
Each branch has its own view of history
Summary
Personal version control
Going solo
A personal productivity tool
The solo workflow
Starting a project
Putting an existing project under version control
Starting a new project
Controlling file registration
What does Bazaar track?
Selective registration
Ignoring files
Global ignores
Reviewing changes
Looking before you leap
bzr status
bzr diff
Recording changes
bzr commit
Message from an editor
Selective commit
Giving credit for a change
Browsing history
bzr log
Viewing merged revisions
Tuning the output
Viewing the history for a file
Viewing an old version of a file
Graphical history viewers
Releasing a project
Packaging a release
Tagging a release
Undoing mistakes
Mistakes happen
Dropping the revision history for a project
Deregistering a file or directory
Undoing changes since the last commit
Undoing changes to a file since the last commit
Undoing the last commit
Undoing multiple commits
Reverting to the state of an earlier version
Correcting a tag
Clearing a tag
Sharing with peers
Working with another
Peer-to-peer rocks
The partner workflow
Branching a project
Branch URLs
A reminder about shared repositories
The branch command
Time and space considerations
Viewing branch information
Merging changes
Parallel development
The merge command
How does merging work?
Recording a merge
Merge tracking
Resolving conflicts
Workflow
Listing conflicts
Resolving a conflict
Using the remerge command
Using external tools to resolve conflicts
Annotating changes
Seeing the origin of content
GUI tools
Team collaboration, central style
Centralized development
Motivation
Centralized workflow
Publishing a branch
Setting up a central repository
Starting a central branch
Using checkouts
Turning a branch into a checkout
Turning a checkout into a branch
Getting a checkout
Getting a lightweight checkout
Updating to the latest content
Handling commit failures
Working offline on a central branch
The centralized with local commits workflow
Committing locally
Being disconnected for long time periods
Merging a series of local commits
Reusing a checkout
Motivation
Changing where a branch is bound to
Switching a lightweight checkout
Team collaboration, distributed style
Distributed development
Motivation
The decentralized with shared mainline workflow
Organizing branches
Mirror branches
Task branches
Refreshing a mirror branch
Merging the latest trunk into a feature branch
Merging a feature into the trunk
Backing up task branches
Using gatekeepers
The decentralized with human gatekeeper workflow
The decentralized with automatic gatekeeper workflow
Sending changes
Motivation
Understanding merge directives
Creating a merge directive
Applying a merge directive
Miscellaneous topics
The journey ahead
Pseudo merging
Cherrypicking
Merging without parents
Reverse cherrypicking
Merging uncommitted changes
Rebasing
Shelving Changes
Filtered views
Introducing filtered views
Creating a view
Listing the current view
Switching between views
Temporarily disabling a view
Deleting views
Things to be aware of
Using stacked branches
Motivation
What is a stacked branch?
Creating a stacked branch
Creating a stacked checkout
Pushing a stacked branch
Limitations of stacked branches
Changing branch stacking
Running a smart server
Dumb servers
High-performance smart server
SSH
inetd
Dedicated
Using hooks
What is a hook?
Using hooks
Debugging hooks
Exporting version information
Getting the last revision number
Getting more version information
Python projects
Getting version info in other formats
Check clean
A brief tour of some popular plugins
BzrTools
Overview
shell
cdiff
bzr-svn
Overview
A simple example
Using a central repository mirror
Limitations of bzr-svn
Integrating Bazaar into your environment
Web browsing
Overview
Bug trackers
Associating commits and bugs
Metadata recording vs bug tracker updating
Making corrections
Appendices
Specifying revisions
Revision identifiers and ranges
Available revision identifiers
Numbers
revid
before
date
Ancestor
Branch
Organizing your workspace
Common workspace layouts
Lightweight checkout
Standalone tree
Feature branches
Local sandbox
Advanced layouts
Advanced shared repository layouts
"SVN-Style" (trunk/, branches/)
project/trunk
trunk/project
Nested Style (project/branch/sub-branch/)
Sorted by Status (dev/, merged/, experimental/)
Sorted by date/release/etc (2006-06/, 2006-07/, 0.8/, 0.9)
Simple developer naming (project/joe/foo, project/barry/bar)
Summary
Configuring email
Why set up an email address with Bazaar?
How to set up your email address
Setting email via the 'whoami' command
Setting email via default configuration file
Setting email on a per-branch basis
Setting email via environment variable
Concerns about spam
Serving Bazaar with Apache
Example
Configuring Apache 2.0
FastCGI
mod_python
mod_wsgi
Configuring Bazaar
FastCGI
mod_python
mod_wsgi
Clients
Advanced configuration
Pushing over the http smart server
Writing a plugin
Introduction
Creating a new command
Specifying a plugin version number
Plugin searching rules
More information
Tutorials
Bazaar in five minutes
Introduction
Installation
Introducing yourself
Putting files under version control
Making changes to your files
Viewing the revision log
Publishing your branch with sftp
Publishing your branch with Launchpad
Creating your own copy of another branch
Updating your branch from the main branch
Merging your work into the parent branch
Learning more
Bazaar Tutorial
Introduction
The purpose of version control
How DVCS is different
Introducing yourself to Bazaar
Creating a branch
Branch locations
Reviewing changes
bzr status
bzr diff
Committing changes
bzr commit
Message from an editor
Marking bugs as fixed
Selective commit
Removing uncommitted changes
Ignoring files
The .bzrignore file
bzr ignore
Global ignores
Examining history
bzr log
Branch statistics
Versioning directories
Deleting and removing files
Branching
Following upstream changes
Merging from related branches
Publishing your branch
Moving changes between trees
Using Bazaar with Launchpad
Motivation
Communities are different to teams
The need for Collaborative Development Environments
Helping communities work with related communities
Launchpad: More development, less friction
Bazaar: Launchpad's VCS client
Finding and browsing branches using Launchpad
Finding available branches
Registering branches
Browsing branches
Accessing code in Launchpad using Bazaar
Getting the code for an open source project
Publishing your changes
Personal branches
Linking branches using Launchpad
Associating a branch with a bug
Changing the state in Launchpad while committing in Bazaar
Associating a branch with a blueprint
Managing releases using Launchpad
Integrating changes
Branch merge proposals
Code review tracking
Personal Package Archives (PPAs)
Translations
Summary
Centralized Workflow Tutorial
Overview
Initial Setup
Setting User Email
Setting up a local Repository
Setting up a remote Repository
Migrating an existing project to Bazaar
Developer 1: Creating the first revision
Developer N: Getting a working copy of the project
Developing on separate branches
Creating and working on a new branch
Merging changes back
Recommended Branching
Glossary
Shared Repository
Quick Reference
Bazaar Release Notes
bzr 2.2b1
Compatibility Breaks
New Features
Bug Fixes
API Changes
Internals
Testing
bzr 2.1.1
Bug Fixes
Documentation
API Changes
bzr 2.1.0
Bug Fixes
Improvements
API Changes
Internals
API Changes
bzr 2.1.0rc2
API Changes
bzr 2.1.0rc1
New Features
Bug Fixes
Improvements
Documentation
API Changes
Internals
Testing
bzr 2.0.5
Bug Fixes
Documentation
bzr 2.0.4
Bug Fixes
Testing
bzr 2.1.0b4
Compatibility Breaks
New Features
Bug Fixes
Improvements
Documentation
API Changes
Internals
Testing
bzr 2.0.3
Bug Fixes
bzr 2.1.0b3
New Features
Bug Fixes
Documentation
Internals
Testing
bzr 2.1.0b2
Bug Fixes
Improvements
Documentation
API Changes
Internals
bzr 2.0.2
Bug Fixes
Improvements
Documentation
bzr 2.1.0b1
New Features
Bug Fixes
Improvements
Documentation
API Changes
Internals
Testing
bzr 2.0.1
Bug Fixes
Documentation
bzr 2.0.0
Changes from 2.0.0rc2 to final
bzr 2.0.0rc2
New Features
Bug Fixes
Documentation
bzr 2.0.0rc1
Compatibility Breaks
New Features
Bug Fixes
Improvements
Documentation
API Changes
Testing
bzr 1.18.1
Bug Fixes
Improvements
API Changes
bzr 1.18
Compatibility Breaks
New Features
Bug Fixes
Improvements
Documentation
API Changes
Internals
Testing
bzr 1.18rc1
New Features
Bug Fixes
Improvements
Documentation
API Changes
Internals
Testing
bzr 1.17.1 (unreleased)
Bug Fixes
bzr 1.17
Changes from 1.17rc1 to 1.17final
Compatibility Breaks
New Features
Bug Fixes
Internals
Improvements
Documentation
API Changes
bzr 1.16.1
Bug Fixes
bzr 1.16
Changes from 1.16rc1 to 1.16final
Compatibility Breaks
New Features
Improvements
Bug Fixes
Documentation
API Changes
Internals
Testing
bzr 1.15
Changes from 1.15.1 to 1.15.2
Changes from 1.15final to 1.15.1
Changes from 1.15rc1 to 1.15final
Compatibility Breaks
New Features
Improvements
Bug Fixes
Documentation
API Changes
Internals
Testing
bzr 1.14
Changes from 1.14final to 1.14.1
Changes from 1.14rc2 to 1.14final
Changes from 1.14rc1 to 1.14rc2
Compatibility Breaks
New Features
Improvements
Bug Fixes
Documentation
API Changes
Testing
Internals
bzr 1.13
Changes From 1.13.1 to 1.13.2
Bug Fixes
Changes From 1.13final to 1.13.1
Bug Fixes
Changes From 1.13rc1 to 1.13final
Compatibility Breaks
New Features
Improvements
Bug Fixes
Documentation
API Changes
Internals
bzr 1.12
Changes from RC1 to Final
Compatibility Breaks
New Features
Improvements
Bug Fixes
Documentation
API Changes
Internals
bzr 1.11
Bug Fixes
bzr 1.11rc1
Changes
New Features
Improvements
Bug Fixes
Documentation
API Changes
Testing
Internals
bzr 1.10
bug Fixes
bzr 1.10rc1
New Features
Improvements
Bug Fixes
API Changes
Testing
bzr 1.9
Bug Fixes
bzr 1.9rc1
New Features
Improvements
Bug Fixes
Documentation
API Changes
Internals
bzr 1.8
Bug Fixes
Portability
bzr 1.8rc1
Changes
Features
Improvements
Bug Fixes
Documentation
API Changes
Testing
Internals
bzr 1.7.1
bzr 1.7.1rc1
Features
bzr 1.7
Features
bzr 1.7rc2
Bug Fixes
bzr 1.7rc1
Changes
Features
Improvements
Bug Fixes
Documentation
API Changes
Testing
Internals
bzr 1.6.1
bzr 1.6.1rc2
Bug Fixes
bzr 1.6.1rc1
Bug Fixes
bzr 1.6
bzr 1.6rc5
Bug Fixes
bzr 1.6rc4
Bug Fixes
bzr 1.6rc3
Changes
Improvements
Bug Fixes
bzr 1.6rc2
Bug Fixes
bzr 1.6rc1
Changes
Improvements
Bug Fixes
API Changes
Internals
bzr 1.6beta3
Features
Improvements
Bug Fixes
Documentation
Testing
API Changes
Internals
bzr 1.6beta2
Bug Fixes
Improvements
Documentation
Testing
API Changes
Internals
bzr 1.6beta1
Notes When Upgrading
Changes
Features
Improvements
Bugfixes
Documentation
Testing
Internals
API Changes
bzr 1.5
Changes
Documentation
bzr 1.5rc1
Changes
Improvements
Bugfixes
Documentation
Testing
Internals
API Changes
bzr 1.4
Bug Fixes
bzr 1.4rc2
Bug Fixes
bzr 1.4rc1
Changes
Features
Improvements
Bugfixes
Documentation
API Breaks
Testing
Internals
bzr 1.3.1
bzr 1.3.1rc1
Bug Fixes
bzr 1.3
Testing
bzr 1.3rc1
Notes When Upgrading
Changes
Features
Improvements
Bugfixes
Documentation
API Breaks
Testing
Internals
bzr 1.2
Bug Fixes
bzr 1.2rc1
Notes When Upgrading
Changes
Features
Improvements
Bugfixes
API Breaks
Testing
Internals
bzr 1.1
bzr 1.1rc1
Changes
Features
Improvements
Bugfixes
Documentation
Internals
API Breaks
Testing
bzr 1.0
Documentation
bzr 1.0rc3
Changes
Bugfixes
Documentation
Internals
bzr 1.0rc2
Improvements
Internals
Bugfixes
API Breaks
bzr 1.0rc1
Notes When Upgrading
Changes
Features
Performance
Improvements
Documentation
Bug Fixes
API Breaks
Internals
bzr 0.92
Changes
bzr 0.92rc1
Changes
Features
Performance
Improvements
Documentation
Bug Fixes
API Breaks
Internals
Testing
bzr 0.91
Bug Fixes
bzr 0.91rc2
bzr 0.91rc1
Changes
Features
Bug Fixes
Improvements
API Breaks
Testing
Internals
bzr 0.90
Improvements
API Changes
bzr 0.90rc1
Bugfixes
Improvements
Library API Breaks
Internals
Testing
bzr 0.18
Bugfixes
bzr 0.18rc1
Bugfixes
Improvements
Library API Breaks
Internals
Testing
bzr 0.17
Bugfixes
bzr 0.17rc1
Notes When Upgrading
Internals
Improvements
Bugfixes
bzr 0.16
Bugfixes
Improvements
bzr 0.16rc2
Bugfixes
bzr 0.16rc1
Notes When Upgrading
Improvements
Internals
Bugfixes
Testing
bzr 0.15
Bugfixes
bzr 0.15rc3
Changes
Improvements
Internals
Bugfixes
bzr 0.15rc2
Notes When Upgrading
Improvements
Internals
Bugfixes
bzr 0.15rc1
Surprises
Improvements
Internals
Bugfixes
Testing
bzr 0.14
Improvements
Bug Fixes
bzr 0.14rc1
Improvements
Internals
Bug Fixes
bzr 0.13
bzr 0.13rc1
Improvements
Internals
Bug Fixes
Testing
bzr 0.12
Internals
bzr 0.12rc1
Improvements
API Incompatability
Internals
Bug Fixes
Testing
bzr 0.11
bzr 0.11rc2
Bug Fixes
bzr 0.11rc1
Improvements
Bug Fixes
Portability
Internals
Testing
bzr 0.10
Improvements
Bug Fixes
Internals
bzr 0.9.0
Surprises
Improvements
Bug Fixes
Internals
bzr 0.8.2
Bug Fixes
bzr 0.8.1
Bug Fixes
Changes
Changes
New Features
Internals
Testing
bzr 0.8
Notes When Upgrading
Improvements
Changes
Internals
Testing
bzr 0.7
Changes
Improvements
Bug Fixes
Testing
Internals
bzr 0.6
Improvements
Testing
Internals
Bug Fixes
bzr 0.1.1
Bug Fixes
Performance
bzr 0.1
Notes
Bug Fixes
Improvements
Internals
Testing
bzr 0.0.9
Bug Fixes
Improvements
Internals
bzr 0.0.8
Improvements
Internals
Bug Fixes
Portability
bzr-0.0.7
New Features
Enhancements
Bug Fixes
Changes
Library
bzr-0.0.6
New Features
Enhancements
Changes
Bug Fixes
bzr-0.0.5
Changes
Enhancements
Bug Fixes
Testing
Internal
Portability
bzr-0.0.4
Enhancements
Changes
Bug Fixes
Internal
Portability
bzr-0.0.3
Enhancements
Changes
Portability
Internal
Testing
bzr-0.0.2.1
Portability
bzr-0.0.2
Enhancements
bzr-0.0.1
Enhancements
Bug Fixes
Portability
bzr-0.0.0.69
Enhancements
Bazaar 2.0 Upgrade Guide
Overview
High level upgrade process
Upgrading the core software
Upgrading required plugins
Migrating data to the new default format
Data migration
Preparing for data migration
Introducing the upgrade-related commands
Communicating with your community
Migrating a standalone branch
Migrating branches in a shared repository
Migrating branches on Launchpad
Migrating local branches after a central trunk has migrated
Tips and tricks
Finding obsolete branches
Bazaar User Reference
About This Manual
Concepts
Branches
Checkouts
Content Filters
Content formats
Format conversion
Enabling content filters
Impact on commands
Refreshing your working tree
Criss-Cross
Diverged Branches
Discovering What Has Diverged
A Solution
End of Line Conversion
Storage Formats
Patterns
Repositories
Rules
Introduction
Files
Rule Patterns
Standalone Trees
Branches Out of Sync
Working Trees
Lists
Authentication Settings
Intent
Authentication definitions
File format
Examples
Personal projects hosted outside
Source hosting provider
HTTPS, SFTP servers and their proxy
Planned enhancements
Bug Tracker Settings
Launchpad
bugzilla_<tracker>_url
trac_<tracker>_url
bugtracker_<tracker>_url
Configuration Settings
Environment settings
BZR_EMAIL
BZR_PROGRESS_BAR
BZR_SIGQUIT_PDB
BZR_HOME
BZR_SSH
BZR_PDB
BZR_REMOTE_PATH
BZR_EDITOR
BZR_PLUGIN_PATH
BZR_DISABLE_PLUGINS
BZR_PLUGINS_AT
Example:
BZRPATH
Configuration files
Location
General format
Comments
Section headers
Section variables
Variable policies
The main configuration file, bazaar.conf
The branch location configuration file, locations.conf
The authentication configuration file, authentication.conf
Common variable options
debug_flags
email
editor
log_format
check_signatures
create_signatures
recurse
gpg_signing_command
bzr_remote_path
smtp_server
smtp_username, smtp_password
mail_client
submit_branch
public_branch
suppress_warnings
Branch type specific options
append_revisions_only
parent_location
push_location
push_strict
dpush_strict
bound_location
bound
send_strict
Conflict Types
Text conflicts
Content conflicts
Tag conflicts
Duplicate paths
Unversioned parent
Missing parent
Deleting parent
Path conflict
Parent loop
Non-directory parent
MalformedTransform
Current Storage Formats
Debug Flags
Environment Variables
Files
Global Options
Hooks
Introduction
BranchHooks
automatic_tag_name
open
post_change_branch_tip
post_commit
post_pull
post_push
post_uncommit
pre_change_branch_tip
pre_commit
set_rh
transform_fallback_location
BzrDirHooks
pre_open
CommandHooks
extend_command
get_command
get_missing_command
list_commands
InfoHooks
repository
LockHooks
lock_acquired
lock_broken
lock_released
MergeHooks
merge_file_content
MergeDirectiveHooks
merge_request_body
MessageEditorHooks
commit_message_template
MutableTreeHooks
post_commit
start_commit
SmartClientHooks
call
SmartServerHooks
server_started
server_started_ex
server_stopped
RioVersionInfoBuilderHooks
revision
Location aliases
Log Formats
Other Storage Formats
Revision Identifiers
Standard Options
Status Flags
URL Identifiers
Commands
Bazaar System Administrator's Guide
Introduction
Scope of this guide
What you need to run a Bazaar server
Simple Setups
Smart server
Setup
Client
Further Configuration
Other Setups
Dumb servers
Smart server over HTTP(S)
Direct Smart Server Access
Migration
Fast Import
Subversion Conversion
Extending Bazaar with Hooks and Plugins
Email Notification
email
hookless-email
email-notifier
Feed Generation
branchfeed
Mirroring
push_and_update
automirror
Other Useful Plugins
pqm (plugin)
testrunner
checkeol
text_checker
Web-based code browsing
Loggerhead
Requirements
Built-in Web Server
Behind a Proxy
Other web interfaces
Integration with Other Tools
Patch Queue Manager (PQM)
Bug Trackers
Continuous Integration Tools
Bundle Buggy
Security
Authentication
Using SSH
Using HTTP authentication methods
Access Control
Additional Considerations with bzr_access
Back-up and Restore
Filesystem Backups
Bazaar as its own backup
Bound Branch Backups
Restoring from Backups
Checking backup consistency
Restoring Filesystem Backups
Restoring Bazaar-based Backups
Upgrades
Software upgrades
Disk format upgrades
Plugin upgrades
Advanced Topics
System Monitoring
Capacity Planning Tips
Clustering
Multi-site Setups
Setup
Merging to master
Merging back to local trunks
Other Considerations
Get in touch
Submit feedback about this site to:
[email protected]
Home