Mercurial: The Definitive Guide Compiled From C3863298abc7 (2009 05 21) Mercurial

User Manual:

Open the PDF directly: View PDF .
Page Count: 194 [warning: Documents this large are best viewed by clicking the View PDF Link!]

Scroll down to view the document on your mobile browser.

Mercurial: The Definitive Guide
Table of Contents
Preface
- 1. Technical storytelling
- 2. Thank you for supporting Mercurial
- 3. Acknowledgments
- 4. Conventions Used in This Book
- 5. Using Code Examples
- 6. Safari® Books Online
- 7. How to Contact Us
Chapter 1. How did we get here?
- 1.1. Why revision control? Why Mercurial?
  - 1.1.1. Why use revision control?
  - 1.1.2. The many names of revision control
- 1.2. About the examples in this book
- 1.3. Trends in the field
- 1.4. A few of the advantages of distributed revision control
  - 1.4.1. Advantages for open source projects
    - 1.4.1.1. The forking non-problem
  - 1.4.2. Advantages for commercial projects
- 1.5. Why choose Mercurial?
- 1.6. Mercurial compared with other tools
- 1.7. Switching from another tool to Mercurial
- 1.8. A short history of revision control
Chapter 2. A tour of Mercurial: the basics
- 2.1. Installing Mercurial on your system
- 2.2. Getting started
  - 2.2.1. Built-in help
- 2.3. Working with a repository
  - 2.3.1. Making a local copy of a repository
  - 2.3.2. What's in a repository?
- 2.4. A tour through history
- 2.5. All about command options
- 2.6. Making and reviewing changes
- 2.7. Recording changes in a new changeset
- 2.8. Sharing changes
- 2.9. Starting a new project
Chapter 3. A tour of Mercurial: merging work
- 3.1. Merging streams of work
- 3.2. Merging conflicting changes
  - 3.2.1. Using a graphical merge tool
  - 3.2.2. A worked example
- 3.3. Simplifying the pull-merge-commit sequence
- 3.4. Renaming, copying, and merging
Chapter 4. Behind the scenes
- 4.1. Mercurial's historical record
- 4.2. Safe, efficient storage
- 4.3. Revision history, branching, and merging
- 4.4. The working directory
- 4.5. Other interesting design features
Chapter 5. Mercurial in daily use
- 5.1. Telling Mercurial which files to track
  - 5.1.1. Explicit versus implicit file naming
  - 5.1.2. Mercurial tracks files, not directories
- 5.2. How to stop tracking a file
- 5.3. Copying files
- 5.4. Renaming files
- 5.5. Recovering from mistakes
- 5.6. Dealing with tricky merges
  - 5.6.1. File resolution states
  - 5.6.2. Resolving a file merge
- 5.7. More useful diffs
- 5.8. Which files to manage, and which to avoid
- 5.9. Backups and mirroring
Chapter 6. Collaborating with other people
- 6.1. Mercurial's web interface
- 6.2. Collaboration models
- 6.3. The technical side of sharing
- 6.4. Informal sharing with hg serve
  - 6.4.1. A few things to keep in mind
- 6.5. Using the Secure Shell (ssh) protocol
- 6.6. Serving over HTTP using CGI
- 6.7. System-wide configuration
  - 6.7.1. Making Mercurial more trusting
Chapter 7. File names and pattern matching
- 7.1. Simple file naming
- 7.2. Running commands without any file names
- 7.3. Telling you what's going on
- 7.4. Using patterns to identify files
  - 7.4.1. Shell-style glob patterns
    - 7.4.1.1. Watch out!
  - 7.4.2. Regular expression matching with re patterns
- 7.5. Filtering files
- 7.6. Permanently ignoring unwanted files and directories
- 7.7. Case sensitivity
Chapter 8. Managing releases and branchy development
- 8.1. Giving a persistent name to a revision
- 8.2. The flow of changes—big picture vs. little
- 8.3. Managing big-picture branches in repositories
- 8.4. Don't repeat yourself: merging across branches
- 8.5. Naming branches within one repository
- 8.6. Dealing with multiple named branches in a repository
- 8.7. Branch names and merging
- 8.8. Branch naming is generally useful
Chapter 9. Finding and fixing mistakes
- 9.1. Erasing local history
- 9.2. Reverting the mistaken change
  - 9.2.1. File management errors
- 9.3. Dealing with committed changes
- 9.4. Changes that should never have been
- 9.5. Finding the source of a bug
  - 9.5.1. Using the hg bisect command
  - 9.5.2. Cleaning up after your search
- 9.6. Tips for finding bugs effectively
Chapter 10. Handling repository events with hooks
- 10.1. An overview of hooks in Mercurial
- 10.2. Hooks and security
- 10.3. A short tutorial on using hooks
  - 10.3.1. Performing multiple actions per event
  - 10.3.2. Controlling whether an activity can proceed
- 10.4. Writing your own hooks
- 10.5. Some hook examples
  - 10.5.1. Writing meaningful commit messages
  - 10.5.2. Checking for trailing whitespace
- 10.6. Bundled hooks
- 10.7. Information for writers of hooks
- 10.8. Hook reference
Chapter 11. Customizing the output of Mercurial
- 11.1. Using precanned output styles
  - 11.1.1. Setting a default style
- 11.2. Commands that support styles and templates
- 11.3. The basics of templating
- 11.4. Common template keywords
- 11.5. Escape sequences
- 11.6. Filtering keywords to change their results
  - 11.6.1. Combining filters
- 11.7. From templates to styles
  - 11.7.1. The simplest of style files
  - 11.7.2. Style file syntax
- 11.8. Style files by example
Chapter 12. Managing change with Mercurial Queues
- 12.1. The patch management problem
- 12.2. The prehistory of Mercurial Queues
  - 12.2.1. A patchwork quilt
  - 12.2.2. From patchwork quilt to Mercurial Queues
- 12.3. The huge advantage of MQ
- 12.4. Understanding patches
- 12.5. Getting started with Mercurial Queues
- 12.6. More about patches
- 12.7. More on patch management
  - 12.7.1. Deleting unwanted patches
  - 12.7.2. Converting to and from permanent revisions
- 12.8. Getting the best performance out of MQ
- 12.9. Updating your patches when the underlying code changes
- 12.10. Identifying patches
- 12.11. Useful things to know about
- 12.12. Managing patches in a repository
  - 12.12.1. MQ support for patch repositories
  - 12.12.2. A few things to watch out for
- 12.13. Third party tools for working with patches
- 12.14. Good ways to work with patches
- 12.15. MQ cookbook
- 12.16. Differences between quilt and MQ
Chapter 13. Advanced uses of Mercurial Queues
- 13.1. The problem of many targets
  - 13.1.1. Tempting approaches that don't work well
- 13.2. Conditionally applying patches with guards
- 13.3. Controlling the guards on a patch
- 13.4. Selecting the guards to use
- 13.5. MQ's rules for applying patches
- 13.6. Trimming the work environment
- 13.7. Dividing up the series file
- 13.8. Maintaining the patch series
  - 13.8.1. The art of writing backport patches
- 13.9. Useful tips for developing with MQ
  - 13.9.1. Organising patches in directories
  - 13.9.2. Viewing the history of a patch
Chapter 14. Adding functionality with extensions
- 14.1. Improve performance with the inotify extension
- 14.2. Flexible diff support with the extdiff extension
  - 14.2.1. Defining command aliases
- 14.3. Cherrypicking changes with the transplant extension
- 14.4. Send changes via email with the patchbomb extension
  - 14.4.1. Changing the behavior of patchbombs
Appendix A. Migrating to Mercurial
- A.1. Importing history from another system
- A.2. Migrating from Subversion
  - A.2.1. Philosophical differences
  - A.2.2. Quick reference
- A.3. Useful tips for newcomers
Appendix B. Mercurial Queues reference
- B.1. MQ command reference
- B.2. MQ file reference
  - B.2.1. The series file
  - B.2.2. The status file
Appendix C. Installing Mercurial from source
- C.1. On a Unix-like system
- C.2. On Windows
Appendix D. Open Publication License
- D.1. Requirements on both unmodified and modified versions
- D.2. Copyright
- D.3. Scope of license
- D.4. Requirements on modified works
- D.5. Good-practice recommendations
- D.6. License options

Navigation menu