![]() (until HG's issue 127 gets resolved for good). Difference to another branch/tag If you want to see the changes of different branches (maybe the current one to another branch or two branches) you can use the log dialog and select the two revisions as described above for 'Difference between two previous revisions'. When whitespace changes are not interesting the diffw extension is very useful Then from the explorer context menu select TortoiseGit Diff. The schemes extension is handy to be used when developing for OOo. This is may be helpful for documentation links direct to hg-wiki. You can use interwiki links to Mercurial wiki e.g. You should never create multiple heads on an outgoing repo unless you really know what you are doing, because you will need to merge the heads anyway if you want your cws to be integrated someday, and thus you can do the merge before pushing just as well. hg merge This is the easiest possibility.When you accidentally created a repo with multiple heads, these are the possibilities to get rid of them: Handling multiple heads Getting rid of multiple heads If you want to use the ssh client of your Cygwin shell (and also ssh-agent), add the following to the section of your mercurial.ini:.TortoiseHg allows easy graphical access to hg repositories within the Windows Explorer. If you want to use the ssh-agent then you have to specify the following line in the section of ~/.hgrc:įor the graphical interface of TortoiseHg Putty's pageant is the default ssh key provider. ![]() You can decide which ssl support you use in the cygwin shell. To get rid of cygwin's hg rename /usr/bin/hg. There are many different ways to compare branches, and its depend on the specific use case you need. TortoiseHg ( ) can be used as alternative. Hg out -q -M -template '\n' -newest-firstĭepending on the cygwin version, using cygwins hg (and other tools) sometimes fails. Sometimes it is interesting to know which modules in your CWS actually contain changes. Obtain a list of all modules which contain changes search for your last pull/merge from the master withĪlternatively, if you just did a pull/merge from master:.If your current milestone tag is *not* locally available (might happen, see above): If your current milestone tag is locally available: hg log -follow-first -P will show only the CWS changesets.Ĭombined diff which contains exactly the changes of your CWS without anything pulled from master.Right-click your project suite in the Project Explorer and then click Source Control > Visual Diff. Select File > Source Control > Visual Diff from the TestComplete main menu. hg log -follow-first is a convenient way to display your CWS changes at the top of the log. If you use TortoiseHg to work with Mercurial from TestComplete, you can use your visual diff tool specified by Mercurial settings to view current changes.If you not comfortable in handling multiple heads, then dont do that! If the cws is on DEV300_m60 and you pull it into a local repo that is on DEV300_m61, you will create new heads in the local repo.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |