Daily use of Mercurial

• Handling files in Mercurial
  • Telling Mercurial which files to track
    • Explicit versus implicit file naming
    • Mercurial tracks files, not directories
  • How to stop tracking a file
    • Removing a file does not affect its history
    • Missing files
    • Aside: why tell Mercurial explicitly to remove a file?
    • Useful shorthand—adding and removing files in one step
  • Copying files
    • Behavior of the hg copy command
  • Renaming files
  • Recovering from mistakes
  • More useful diffs
  • Which files to manage, and which to avoid
  • Running commands without any file names
  • Telling you what's going on
  • Using patterns to identify files
    • Shell-style glob patterns
  • Watch out!
    • Regular expression matching with re patterns
  • Filtering files
  • Permanently ignoring unwanted files and directories
  • Case sensitivity
    • Safe, portable repository storage
    • Detecting case conflicts
    • Fixing a case conflict
• Finding and fixing mistakes
  • Erasing local history
    • The accidental commit
    • Rolling back a transaction
    • The erroneous pull
    • Rolling back is useless once you've pushed
    • You can only roll back once
  • Reverting the mistaken change
    • File management errors
  • Dealing with committed changes
    • Backing out a changeset
    • Backing out the tip changeset
    • Backing out a non-tip change
  • Always use the --merge option
    • Gaining more control of the backout process
    • Why hg backout works as it does
  • Changes that should never have been
    • Backing out a merge
    • Protect yourself from “escaped” changes
    • What to do about sensitive changes that escape
  • Finding the source of a bug
    • Using the hg bisect command
    • Cleaning up after your search
  • Tips for finding bugs effectively
    • Give consistent input
    • Automate as much as possible
    • Check your results
    • Beware interference between bugs
    • Bracket your search lazily
• Adding functionality with extensions
  • Improve performance with the inotify extension
  • Flexible diff support with the extdiff extension
    • Defining command aliases
  • Cherrypicking changes with the transplant extension
  • Send changes via email with the patchbomb extension
    • Changing the behavior of patchbombs