Mercurial_ The Definitive Guide - Bryan O'Sullivan [141]
working directory, Updating the Working Directory, Performing the Merge, The Working Directory, The Working Directory, Creating a New Head, Merging Changes, Removing a File Does Not Affect Its History, Recovering from Mistakes, Running Commands Without Any Filenames, Detecting Case Conflicts, Fixing a Case Conflict, The Accidental Commit, Safety Checks, and Overriding Them
case conflicts, detecting and fixing, Detecting Case Conflicts, Fixing a Case Conflict
operating on, Running Commands Without Any Filenames
parents of, The Working Directory, Merging Changes
when merging changes, Merging Changes
removed files and, Removing a File Does Not Affect Its History
safety checks with MQ commands, Safety Checks, and Overriding Them
undoing changes to, Recovering from Mistakes, The Accidental Commit
updated when merging, Performing the Merge
updating, Updating the Working Directory
updating to different changeset, Creating a New Head
X
-X (--exclude) option (for several commands), Filtering Files
About the Author
Bryan O'Sullivan is an Irish hacker and writer who likes distributed systems, open source software, and programming languages. He was a member of the initial design team for the Jini network service architecture (subsequently open sourced as Apache River). He has made significant contributions to, and written a book about, the popular Mercurial revision control system. He lives in San Francisco with his wife and sons. Whenever he can, he runs off to climb rocks.
Colophon
The animal on the cover of Mercurial: The Definitive Guide is a House Martin (Delichon urbicum), which is part of the swallow family. Originally cliff and cave dwellers, these noisy birds now prefer human structures and can be found nesting in bridges and houses throughout Europe, north Africa, and the more temperate regions of Asia. The name House Martin is derived from the bird’s tendency to build its nests under the eaves of buildings. They build closed-cup nests, attached to both the vertical surface and the overhang of the structure, and reinforce them with mud, creating unusually strong dwellings.
Given the House Martin’s wide range of habitation, if you are trying to avoid the eternal pit of peril and are presented with the immortal question, “Is that an African swallow or a European swallow?”, you should answer, “Both.”
The cover image is from Cassell’s Natural History. The cover font is Adobe ITC Garamond. The text font is Linotype Birka; the heading font is Adobe Myriad Condensed; and the code font is LucasFont’s TheSansMonoCondensed.