Books & Videos

Table of Contents

  1. Chapter 1 A Brief History of Revision Control

    1. Why Revision Control? Why Mercurial?

    2. This Book Is a Work in Progress

    3. About the Examples in This Book

    4. Trends in the Field

    5. A Few Advantages of Distributed Revision Control

    6. Why Choose Mercurial?

    7. Mercurial Compared with Other Tools

    8. Switching from Another Tool to Mercurial

    9. A Short History of Revision Control

  2. Chapter 2 A Tour of Mercurial: The Basics

    1. Installing Mercurial on Your System

    2. Getting Started

    3. Working with a Repository

    4. A Tour Through History

    5. All About Command Options

    6. Making and Reviewing Changes

    7. Recording Changes in a New Changeset

    8. Sharing Changes

    9. Starting a New Project

  3. Chapter 3 A Tour of Mercurial: Merging Work

    1. Merging Streams of Work

    2. Merging Conflicting Changes

    3. Simplifying the Pull-Merge-Commit Sequence

    4. Renaming, Copying, and Merging

  4. Chapter 4 Behind the Scenes

    1. Mercurial’s Historical Record

    2. Safe, Efficient Storage

    3. Revision History, Branching, and Merging

    4. The Working Directory

    5. Other Interesting Design Features

  5. Chapter 5 Mercurial in Daily Use

    1. Telling Mercurial Which Files to Track

    2. How to Stop Tracking a File

    3. Copying Files

    4. Renaming Files

    5. Recovering from Mistakes

    6. Dealing with Tricky Merges

    7. More Useful Diffs

    8. Which Files to Manage, and Which to Avoid

    9. Backups and Mirroring

  6. Chapter 6 Collaborating with Other People

    1. Mercurial’s Web Interface

    2. Collaboration Models

    3. The Technical Side of Sharing

    4. Informal Sharing with hg serve

    5. Using the Secure Shell Protocol

    6. Serving Over HTTP Using CGI

    7. System-Wide Configuration

  7. Chapter 7 Filenames and Pattern Matching

    1. Simple File Naming

    2. Running Commands Without Any Filenames

    3. Telling You What’s Going On

    4. Using Patterns to Identify Files

    5. Filtering Files

    6. Permanently Ignoring Unwanted Files and Directories

    7. Case Sensitivity

  8. Chapter 8 Managing Releases and Branchy Development

    1. Giving a Persistent Name to a Revision

    2. The Flow of Changes: Big Picture Versus Little Picture

    3. Managing Big-Picture Branches in Repositories

    4. Don’t Repeat Yourself: Merging Across Branches

    5. Naming Branches Within One Repository

    6. Dealing with Multiple Named Branches in a Repository

    7. Branch Names and Merging

    8. Branch Naming Is Generally Useful

  9. Chapter 9 Finding and Fixing Mistakes

    1. Erasing Local History

    2. Reverting the Mistaken Change

    3. Dealing with Committed Changes

    4. Changes That Should Never Have Been

    5. Finding the Source of a Bug

    6. Tips for Finding Bugs Effectively

  10. Chapter 10 Handling Repository Events with Hooks

    1. An Overview of Hooks in Mercurial

    2. Hooks and Security

    3. A Short Tutorial on Using Hooks

    4. Writing Your Own Hooks

    5. Some Hook Examples

    6. Bundled Hooks

    7. Information for Writers of Hooks

    8. Hook Reference

  11. Chapter 11 Customizing the Output of Mercurial

    1. Using Precanned Output Styles

    2. Commands That Support Styles and Templates

    3. The Basics of Templating

    4. Common Template Keywords

    5. Escape Sequences

    6. Filtering Keywords to Change Their Results

    7. From Templates to Styles

    8. Style Files by Example

  12. Chapter 12 Managing Changes with Mercurial Queues

    1. The Patch Management Problem

    2. The Prehistory of Mercurial Queues

    3. The Huge Advantage of MQ

    4. Understanding Patches

    5. Getting Started with Mercurial Queues

    6. More About Patches

    7. More on Patch Management

    8. Getting the Best Performance Out of MQ

    9. Updating Your Patches When the Underlying Code Changes

    10. Identifying Patches

    11. Useful Things to Know About

    12. Managing Patches in a Repository

    13. Third-Party Tools for Working with Patches

    14. Good Ways to Work with Patches

    15. MQ Cookbook

    16. Differences Between Quilt and MQ

  13. Chapter 13 Advanced Uses of Mercurial Queues

    1. The Problem of Many Targets

    2. Conditionally Applying Patches with Guards

    3. Controlling the Guards on a Patch

    4. Selecting the Guards to Use

    5. MQ’s Rules for Applying Patches

    6. Trimming the Work Environment

    7. Dividing Up the Series File

    8. Maintaining the Patch Series

    9. Useful Tips for Developing with MQ

  14. Chapter 14 Adding Functionality with Extensions

    1. Improve Performance with the inotify Extension

    2. Flexible Diff Support with the extdiff Extension

    3. Cherry-Picking Changes with the transplant Extension

    4. Sending Changes via Email with the patchbomb Extension

  1. Appendix Migrating to Mercurial

    1. Importing History from Another System

    2. Migrating from Subversion

    3. Useful Tips for Newcomers

  2. Appendix Mercurial Queues Reference

    1. MQ Command Reference

    2. MQ File Reference

  3. Appendix Installing Mercurial from Source

    1. On a Unix-Like System

    2. On Windows

  4. Appendix Open Publication License

    1. Requirements on Both Unmodified and Modified Versions

    2. Copyright

    3. Scope of License

    4. Requirements on Modified Works

    5. Good-Practice Recommendations

    6. License Options

  5. Colophon