DenkzeitWiki

Main /

Mercurial

VersionControl
DVCS
MercurialVsGit
Python

MercurialHosting

• http://www.selenic.com/mercurial

Mercurial: a fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects.

• http://tortoisehg.org/
  
  
• http://mercurial.selenic.com/wiki/Download -- latest versions of both: hg and tortoise
  

---

• http://www.serpentine.com/blog/software/mercurial.html
• Mercurial, Part I
  
  
• Bazaar vs. Mercurial : An unscientific comparison
  
  
• Bare-bones basic Mercurial for Subversion users
  

---

• http://rock.hymasfamily.org/blog/2010/03/06/mercurial-will-make-you-a-better-developer/

Introductions

• Hg Init: a Mercurial tutorial
  
  
• http://www.youtube.com/watch?v=JExtkqzEoHY
  
  
• http://mercurial.selenic.com/guide/
• http://mercurial.selenic.com/quickstart/
• http://mercurial.selenic.com/wiki/UnderstandingMercurial?
  
• http://mercurial.selenic.com/wiki/QuickReferenceCardsAndCheatSheets
  
• Google I/O 2009 - Mercurial on BigTable - using BigTable as data-backend.
  
• http://antonym.org/2010/04/25-tips-for-intermediate-mercurial-users.html

Mercurial to backup

TeamSystem

• http://stackoverflow.com/questions/2331636/real-word-use-of-mercurial-with-a-team-foundation-server/2351734#2351734
• http://www.stereoplex.com/2007/aug/1/tfs-and-mercurial/
  • if TS went offline:
    • instead of committing to TS, make a tag in Mercurial
    • rollback (hg -update -C <tag>) to each of your commits (hg log) and commit to TS

Subversion

• http://naleid.com/blog/2008/05/01/using-mercurial-as-a-super-client-for-subversion/

Convert From Subversion To Mercurial

• http://ww2.samhart.com/node/49
  • http://pypi.python.org/pypi/hgsvn
• http://hg.omnifarious.org/~hopper/svn2hg
• http://code.google.com/p/support/wiki/ConvertingSvnToHg
  • check with
    python -c "import svn.core; print svn.core.SVN_VER_MINOR"
  • hg convert <checkout-name-OR-URL>

Tools

• http://visualhg.codeplex.com/ - Mercurial for VisualStudio

---

• http://blogs.msdn.com/bharry/archive/2010/01/27/codeplex-now-supports-mercurial.aspx - Codeplex moved to Mercurial
  • http://blog.eworldui.net/post/2010/03/16/Mercurial-Conversion-from-Team-Foundation-Server.aspx

Interesting Extensions

• http://mercurial.selenic.com/wiki/RecordExtension
  • selecting hunks to commit
    
  
  
• http://mercurial.selenic.com/wiki/CollapseExtension
  • http://bitbucket.org/ccaughie/hgcollapse
  • http://stackoverflow.com/questions/1200691/with-mercurial-how-can-i-compress-a-series-of-changesets-into-one-before-pushi
    
  
  
• http://mercurial.selenic.com/wiki/HisteditExtension
  • http://bitbucket.org/durin42/histedit
  • http://stackoverflow.com/questions/2624083/how-to-fix-an-error-in-a-mercurial-changeset-comment
    
  
  
• http://mercurial.selenic.com/wiki/PurgeExtension
  • remove all unversioned files
    
  
  
• http://mercurial.selenic.com/wiki/ConvertExtension
  • Can also be used to split subdirectories into separate projects: how to
    
  
  
• http://mercurial.selenic.com/wiki/MakewritableExtension
  
  
• http://mercurial.selenic.com/wiki/BookmarksExtension
  • http://x.zpuppet.org/2009/02/27/mercurial-bookmarks/
  • http://www.mronge.com/2009/04/01/a-sample-mercurial-bookmark-workflow/
    • You’re right in that named branches are nearly the same as bookmarks, however even after you close a named branch, it is listed with hg branch with (closed) next to it. That gets really annoying really fast if you happen to create lots of short lived branches.
  • http://blog.experimentalworks.net/2008/11/mercurial-bookmarks/
    
  
  
• http://mercurial.selenic.com/wiki/GraphlogExtension
  
  
• http://mercurial.selenic.com/wiki/BigfilesExtension
  • handles big files - larger than 10MByte
  • http://mercurial.808500.n3.nabble.com/Large-binary-files-td799531.html
    • For performance reasons, it assumes all files can fit comfortably in memory. As the

delta algorithm effectively requires multiple copies in memory, file sizes are limited to about 1/4 available memory. Because 32-bit systems typically have a 3GiB address-space limit, you're effectively limited to 750MiB on such systems.

• http://mercurial.selenic.com/wiki/MqExtension
  • Changes are maintained as patches which are committed into Mercurial. Commits can be removed or reordered, and the underlying patch can be refreshed based on changes made in the working directory. The patch directory can also be placed under revision control, so you can have a separate history of changes made to your patches.
  • http://mercurial.selenic.com/wiki/MqTutorial
  • http://hgbook.red-bean.com/read/managing-change-with-mercurial-queues.html
  • http://hgbook.red-bean.com/read/advanced-uses-of-mercurial-queues.html
  • http://www.stevestreeting.com/2010/04/22/mercurial-queues-just-clicked/
    • A Git User’s Guide to Mercurial Queues
  
  
• https://developer.mozilla.org/en/Mercurial_queues
• http://blogs.sun.com/ace/entry/mq_mercurial_queues
  
  
• http://mercurial.selenic.com/wiki/RebaseProject
  • http://seanerussell.blogspot.com/2009/07/mercurial-rebase.html
  • http://stackoverflow.com/questions/2672351/hg-how-to-do-a-rebase-like-gits-rebase

How Tos

• http://hgtip.com/tips/advanced/2009-09-30-detecting-renames-automatically/

Branching

• http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/

Handling rej-files (on import)

• http://old.nabble.com/GUI-hg-import---td27285309.html
  • hgtk mpatch path\to\file.rej
    • http://oss.oracle.com/~mason/mpatch/
  
  
• http://gunnarwrobel.de/wiki/rej.html
  
• Emacs' diff-mode understands rej-files

 (setq auto-mode-alist
      (append '      ("\\.\\(diffs?\\|patch\\|rej\\)\\'"    . diff-mode)
                ) auto-mode-alist))

Pruning branches

• http://stackoverflow.com/questions/890900/pushing-updates-to-a-pruned-mercurial-branch
• http://old.nabble.com/Pruning-a-*lot*-of-dead-branches-td21603259.html
• http://mercurial.selenic.com/wiki/PruningDeadBranches

Subrepos

• http://mercurial.selenic.com/wiki/subrepos
• http://www.pixelastic.com/blog/51:using-nested-subrepos-with-mercurial-and-tortoisehg
• http://stackoverflow.com/questions/2083393/mercurial-subrepos-how-do-you-create-them-and-how-do-they-work

Multiple Repositories

• http://hgtip.com/tips/advanced/2009-11-17-combining-repositories/
• http://stackoverflow.com/questions/12843/how-to-combine-two-projects-in-mercurial
  
  
• http://hgtip.com/tips/advanced/2009-11-16-using-convert-to-decompose-your-repository/