Working together

• Collaborating with other people
  • Mercurial's web interface
  • Collaboration models
    • Factors to keep in mind
    • Informal anarchy
    • A single central repository
    • A hosted central repository
    • Working with multiple branches
    • Feature branches
    • The release train
    • The Linux kernel model
    • Pull-only versus shared-push collaboration
    • Where collaboration meets branch management
  • The technical side of sharing
  • Informal sharing with hg serve
    • A few things to keep in mind
  • Using the Secure Shell (ssh) protocol
    • How to read and write ssh URLs
    • Finding an ssh client for your system
    • Generating a key pair
    • Using an authentication agent
    • Configuring the server side properly
    • Using compression with ssh
  • Serving over HTTP using CGI
    • Web server configuration checklist
    • Basic CGI configuration
  • What could possibly go wrong?
  • Configuring lighttpd
    • Sharing multiple repositories with one CGI script
  • Explicitly specifying which repositories to publish
    • Downloading source archives
    • Web configuration options
  • Options specific to an individual repository
  • Options specific to the hg serve command
  • Choosing the right ~/.hgrc file to add web items to
  • System-wide configuration
    • Making Mercurial more trusting
• Managing releases and branchy development
  • Giving a persistent name to a revision
    • Handling tag conflicts during a merge
    • Tags and cloning
    • When permanent tags are too much
  • The flow of changes—big picture vs. little
  • Managing big-picture branches in repositories
  • Don't repeat yourself: merging across branches
  • Naming branches within one repository
  • Dealing with multiple named branches in a repository
  • Branch names and merging
  • Branch naming is generally useful
• Merging changes
  • Merging streams of work
    • Head changesets
    • Performing the merge
    • Committing the results of the merge
  • Merging conflicting changes
    • Using a graphical merge tool
    • A worked example
  • Simplifying the pull-merge-commit sequence
  • Renaming, copying, and merging
    • The results of copying during a merge
    • Why should changes follow copies?
    • How to make changes not follow a copy
    • Renaming files and merging changes
    • Divergent renames and merging
    • Convergent renames and merging
    • Other name-related corner cases
  • Dealing with tricky merges
    • File resolution states
    • Resolving a file merge