Bazaar Version Control -- Table of Contents -- Bazaar Version Control -- Credits -- About the Author -- About the Reviewers -- www.PacktPub.com -- Support files, eBooks, discount offers and more -- Why Subscribe? -- Free Access for Packt account holders -- Preface -- What this book covers -- What you need for this book -- Who this book is for -- Conventions -- Reader feedback -- Customer support -- Downloading the example code -- Errata -- Piracy -- Questions -- 1. Getting Started -- Version control systems -- Reverting a project to a previous state -- Viewing the log of changes -- Viewing the differences between revisions -- Branching and merging -- Acronyms related to version control -- Centralized version control systems (CVCS) -- Distributed version control systems (DVCS) -- What is Bazaar? -- Installing Bazaar and its plugins -- GNU/Linux -- Ubuntu, Debian, and derivatives -- Red Hat, Fedora, CentOS, and derivatives -- openSUSE and derivatives -- Installing Bazaar using pip -- Other installation methods -- Windows -- Mac OS X -- Bazaar in a shared hosting environment -- Interacting with Bazaar -- Using the command-line interface -- Using the graphical user interface -- Using the two user interfaces together -- Upgrading Bazaar to the latest version -- Uninstalling Bazaar -- Getting help -- Summary -- 2. Diving into Bazaar -- Understanding the core concepts -- Revision -- Repository -- Branch -- Working tree -- Putting the concepts together -- Storing Bazaar's data in the filesystem -- Introducing the user interfaces -- Using the command-line interface (CLI) -- Using Bazaar Explorer -- Configuring Bazaar -- Configuring the author information -- Configuring the default editor -- Other configuration options -- Performing the basic version control operations -- Putting a directory under version control -- Using the command line.

Using Bazaar Explorer -- Checking the status of files and directories -- Using the command line -- Using Bazaar Explorer -- Adding files to version control -- Using the command line -- Using Bazaar Explorer -- Recording a new revision -- Using the command line -- Using Bazaar Explorer -- Ignoring files -- Using the command line -- Using Bazaar Explorer -- Checkpoint -- Deleting files -- Using the command line -- Using Bazaar Explorer -- Undoing changes -- Using the command line -- Using Bazaar Explorer -- Editing files -- Using the command line -- Using Bazaar Explorer -- Viewing differences in changed files -- Using the command line -- Using Bazaar Explorer -- Checkpoint -- Renaming or moving files -- Using the command line -- Using Bazaar Explorer -- Checkpoint -- Viewing the revision history -- Using the command line -- Using Bazaar Explorer -- Restoring files from a past revision -- Using the command line -- Using Bazaar Explorer -- Putting it all together -- Making different kinds of changes -- Understanding the output the revert command -- Understanding the output of the status command -- Understanding the backup files created by Bazaar -- Understanding the .bzr directory -- How often to commit? -- Beyond the basics -- Mastering the command line -- Common flags -- Common behavior in all the commands -- Using shorter aliases of commands -- Quick reference card -- Using tags -- Specifying revisions -- Specifying a single revision -- Specifying a range of revisions -- Viewing differences between any two revisions -- Viewing differences between any revision and the working tree -- Viewing differences between any two revisions -- Viewing differences going from one revision to the next -- Cloning your project -- Summary -- 3. Using Branches -- What is a branch? -- A single branch with a linear history -- Multiple diverged branches.

Branches with non-linear history -- Unrelated branches -- What can you do with branches? -- Creating branches -- Comparing branches -- Merging branches -- Mirroring branches -- Why use more than one branch? -- Separating the development of new features -- Switching between tasks -- Experimenting with different approaches -- Maintaining multiple versions -- Understanding core terms and concepts -- trunk, master, and mainline -- The tip of a branch -- Source and target branches -- Parent branch -- Diverged branches and the base revision -- Storing branch data -- Using a shared repository -- Using the command line -- Using Bazaar Explorer -- Basic branching and merging -- Getting the example project -- Using the command line -- Using Bazaar Explorer -- Creating a feature branch -- Using the command line -- Using Bazaar Explorer -- Working on a branch -- Starting another branch -- Merging the bugfix branch -- Using the command line -- Using Bazaar Explorer -- Viewing merged revisions in the log -- Using the command line -- Using Bazaar Explorer -- Using the branch command -- Creating branches based on an older revision -- Using the command line -- Using Bazaar Explorer -- Viewing basic branch information -- Comparing branches -- Using the command line -- Viewing missing revisions between branches -- Viewing the differences between branches -- Using Bazaar Explorer -- Viewing the tree of branches -- Viewing missing revisions between branches -- Viewing the differences between branches -- Merging branches -- Performing a three-way merge -- Completing the merge -- Committing the merge -- Aborting the merge -- Resolving conflicts -- Resolving text conflicts -- Resolving content conflicts -- Redoing the merge -- Resolving other types of conflicts -- Merging a subset of revisions -- Merging up to a specific revision -- Merging a range of revisions.

Cherry-picking -- Understanding revision numbers -- Merging from multiple branches -- Mirroring branches -- Mirroring from another branch -- Mirroring from the current branch -- Summary -- 4. Using Bazaar in a Small Team -- Collaborating with others -- Working with remote branches -- Implementing simple workflows -- Sharing branches over the network -- Specifying remote branches -- Using URL parameters -- Using remote branches through a proxy -- Sharing branches using a distributed filesystem -- Sharing branches over SSH -- Using individual SSH accounts -- Using individual SSH accounts with SFTP -- Using a shared restricted SSH account -- Using SSH host aliases -- Using a different SSH client -- Sharing branches using bzr serve -- Sharing branches using inetd -- Sharing branches over HTTP or HTTPS -- Working with remote branches -- Working with remote branches directly -- Using local mirror branches -- Creating a local mirror -- Using a shared repository -- Updating a local mirror -- Using remote mirror branches -- Creating a remote mirror -- Using a shared repository -- Updating a remote mirror -- Using branches without a working tree -- Creating a local branch without a working tree -- Creating or removing the working tree -- Reconfiguring working trees in a shared repository -- Creating remote branches without a working tree -- Slicing and dicing branches -- Implementing simple workflows -- Using independent personal branches -- Merging from branches repeatedly -- Handling criss-cross merges -- Viewing the history from different perspectives -- Using feature branches and a common trunk -- Merging into a common remote trunk -- Merging feature branches in lock-step -- Doing "code reviews" -- Summary -- 5. Working with Bazaar in Centralized Mode -- The centralized mode -- Core operations -- The centralized workflow -- Checkout from the central branch.

Making changes -- Committing changes -- Updating from the server -- Handling conflicts during update -- Advantages -- Easy to understand -- Easy to synchronize efforts -- Widely used -- Disadvantages -- Single point of failure -- Administrative overhead of access control -- The update operation is not safe -- Unrelated changes interleaved in the revision history -- Using Bazaar in centralized mode -- Bound branches -- Creating a checkout -- Using the command line -- Using Bazaar Explorer -- Updating a checkout -- Using the command line -- Using Bazaar Explorer -- Visiting an older revision -- Committing a new revision -- Practical tips when working in centralized mode -- Working with bound branches -- Unbinding from the master branch -- Binding to a branch -- Using local commits -- Working with multiple branches -- Setting up a central server -- Using an SSH server -- Using the smart server over SSH -- Using individual SSH accounts -- Using a shared restricted SSH account -- Using SFTP -- Using bzr serve directly -- Using bzr serve over inetd -- Creating branches on the central server -- Creating a shared repository without working trees -- Reconfiguring a shared repository to not use working trees -- Removing an existing working tree -- Creating branches on the server without a working tree -- Practical use cases -- Working on branches using multiple computers -- Synchronizing backup branches -- Summary -- 6. Working with Bazaar in Distributed Mode -- The distributed mode in general -- Collaborators work independently -- The mainline branch is just a convention -- Collaborators write only to their own branches -- The distributed mode gives great flexibility -- Encouraging feature branches -- The revision history depends on the perspective -- The human gatekeeper workflow -- Overview -- Setting guidelines to accept merge proposals.

The role of the gatekeeper.