![]() On Mac and Linux machines (and Windows machines with Cygwin installed), you can use man hg (for ‘Manual for hg’) from the command line to see the full Mercurial documentation, with all of the command line flags (like -m above) explained. hg pull Pulls changes from a remote repository (like from BitBucket). Make sure your work is committed, right click the other train track and select Merge to local. Pull in work from everyone with Repository > Synchronize > Pull If there is more than one train track on the THG window, you need to merge. ![]() Before I can push, I need to merge my commits with the rest of the world. hg commit -m "Commit message goes here" makes a commit with a given commit message. After that, type a message and click Commit. or you want to override the detected settings, you can manually specify Mercurial settings using global options. Hg summary, for instance, will give you a summary of the Commit to which your working directory is Updated. To start with Hg on the command line, open a terminal, type cd /path/to/your/repository/folder ( cd for Change Directory), and then use any of the commands given on the sheet. You don't have to use these particular icons if you prefer something else, THG has other choices.If you’re interested in using Mercurial / Hg from the command line (i.e., not through TortoiseHg), you may be interested in any of a number of cheat sheets that are available. ![]() INI edits above can also be done through the THG Workbench File > Settings > Tools GUI section.: ![]() Obviously running shelve/unshelve this way is rather coarse-grained but I find that 99% of the time that's all I need. Mac OS X OS X DMG packages are available, thanks to Matt Harbison and Andre Rudlaff. To use the settings tool on Linux, you must have installed. If you do use a tarball, you will need to manually edit the installed thgutil/config.py. One arrow will shelve the current working folder, the other will unshelve. We prefer the use of a local clone of TortoiseHg instead. This will yield new buttons on the toolbar: (careful not to duplicate any existing or sections). Workbench.custom-toolbar = HG_shelve HG_unshelve (Either through File > Settings > Gobal Settings > Edit File button, OR open the file in an editor manually).Īdd the following sections & items: Instructions:Įdit your mercurial.ini settings file. It is possible to configure THG Workbench to integrate (to a certain extent) with the HG shelving feature. Once I realized that, I never use the THG shelf any longer, and that is what I recommend. IMO the HG shelving feature works better than the THG feature from the standpoint of efficiently using HG merge logic to apply shelved changes to the local working folder during an unshelve operation. The following typographical conventions are used in this manual. (Historically, this strange-seeming situation resulted from, I believe, the THG feature being created first before an equivalent / similar feature with the same name was later added to HG proper). Since TortoiseHg is a Windows shell extension its assumed that the user is familiar. I simulate two people working on the same. Binary packages of TortoiseHg for Windows come with Mercurial and a merge tool and are thus completely ready for use. In this video I will demonstrate how you can use Mercurial and TortoiseHG for your daily versioning control needs. The shelving features in 'core' Mercurial (command line hg) and the TortoiseHG GUI are totally independent of each other, as far as I am aware. TortoiseHg consists of the Workbench graphical application, a shell extension which provides overlay icons and context menus in your file explorer, and a command line program named thg.exe which can launch the TortoiseHg tools.
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |