This has been bugging me for some time now.
I have a Windows 8 VM running in Parallels with tortoisehg 2.9. It happens frequently that mercurial will insist that there are uncommited local changes, even if I haven't changed anything.
I tried "hg revert --all", I tried "hg revert --all -r .", I tried "hg update -c -r .", and still the changes won't go away.
If I open the commit window and check the supposed changes, mercurial thinks the entire file is changed, but to the naked eye there don't seem to be any differences. All the lines look like:
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
Is this a line ending problem? If so, why doesn't my Windows 7 pc at work ever have this problem? Any insight would be greatly appreciated.
Is this a line ending problem?
It can be this problem most probably - check it with good differ, which can show inline changes and switch detection of EOL-style
If so, why doesn't my Windows 7 pc at work ever have this problem? Any insight would be greatly appreciated.
Win7 repository may not have EOL Extension or have different settings (not =native) in it
Related
I had a problem working with mercurial, outlined here. I eventually figured out that mercurial is just not working properly at all on my SSD drive. It works better on my secondary HDD on the same machine, but doesn't resolve my other issue.
I am using TortoiseHg 4.9.1 on Windows 10.
Doing the following works fine on the HDD:
hg init temp
cd temp
<create test.txt>
hg ci -A -m "test"
But on the SSD, I get the following message, and the file is marked as added, but not committed:
nothing changed (1 missing files, see 'hg status')
hg status shows the following:
A test.txt
I am not noticing any other errors on the SSD (the OS, as well as all programs, are installed on it and everything seems to be working fine). I tried a scan and repair and get no errors.
Everything was working fine for several months, but now, all of a sudden, it is just not working.
Doing the same test using git, works fine.
Does anyone have any suggestions?
I upgraded to Tortoise 3.6.3 yesterday and now I am prompted every time I pull or push a repo. The keyring is set properly, and my user name is in the url.
Any ideas on what may be wrong? Did 3.6.3 break keyring?
Issue 4401 "mercurial_keyring always asks for user/password" from time of 3.6.2 closed as pure extension-specific and contains solution: don't use username in URL anymore
Here is what to put into .hg/hgrc:
[auth]
default.username=myname
default.prefix=http://myrepo
A good way to debug issues like this is to run merciural from the command line with the debug flag, as in:
hg pull --debug
This will clearly indicate if there are problems getting the repo, user name, and password.
UPDATE: A new version of TortoiseHG has been released (3.8.3 at the time of writing) and fixes this issue: upgrading to latest version should be enough.
I had this exact same problem and found the following investigation article to be quite helpful to better understand what't going on (I'm not the author, BTW).
To cut it short, it seems a bug of the mercurial_keyring extension v1.0.1, introduced in TortoiseHG 3.6.2, which also appears to be fixed in v1.1.1.
If you're into Python compiling, it should be possible to upgrade it manually into TortoiseHG by getting it from its official bitbucket repo, compile it and manually place it into TortoiseHG's /lib/library.zip file (backup it beforehand might be wise): if you're not, you have 2 options:
1) clone the bitbucket repo to your HDD and then configure your Mercurial installation to use the new version of that extension module by writing the following in your C:\Users\USERNAME\mercurial.ini file (which was what I did):
[extensions]
mercurial_keyring = /path/to/mercurial_keyring/mercurial_keyring.py
(Notice: you might also have to put the path in your PATH or PYTHONPATH env variable, depending if you already have Python and/or Mercurial installed on your machine).
2) wait for the next TortoiseHG release that will contain the updated version.
Is this OK to do?
I have one folder that is a checkout of SVN, another that is Hg.
But Windows Explorer is crashing now when I right click a file in the Hg folder.
I uninstalled Hg and then I could right click without a crash.
Reinstalled and crashes came back.
Yes, it's OK. You may have some troubles (but not crashing of Explorer) in case of using different icon-overlays in THG and TSVN (due to limiting amount of overlays to rather small amount)
I have recently updated to eclipse juno. I have also updated mercurial to its latest version, but it is still giving me problems. The mercurial plugin tells :"Unsupported hg version:1.9.3. Expected is at least2.0.0." but its already updated(see pic).
If I try to commit, it automatically opens preferences window, which gives message :"Mercurial is not configured correctly.Run 'hg debuginstall' to analyse.".
When I do that, it says:"no username supplied". Then I run "hg -y debuginstall", which says, no problems were detected.
Everything that I mentioned is depicted in the picture.
Uncheck the option labelled Use default (built-in) Mercurial executable; then in the text box labelled Mercurial executable below, you can enter the full path to the hg.exe under your TortoiseHg 2.5 installation.
I got the same error when I installed Mercurial Eclipse Plugin. I find the configuration file "Mercurial.ini" in the mercurial installation folder. In my case, the path of that folder is "E:\eclipse\plugins\com.intland.hgbinary.win32_2.3.2\os\win32". Edit the configuration file with notepad and add the line "username = your-user-name" where your-user-name is free to choose. I hope it would help.
I am using IntelliJ 11 Community Edition for a project that is in Mercurial (but not at the root of the repository). I integrated the project with Mercurial in the VCS menu, and all the options are now available. However, they don't seem to do anything. The only thing that seemed to do anything is to pull from the server. It doesn't show changed files, commit doesn't do anything. When I deleted a file I got this error message:
hg remove --after src/stats/KolmogorovSmirnovStatistic.java
abort: repository /home/ga1009/PhD/cpp/pmi/java not found!
the root of the repository is /home/ga1009/PhD. How can I get it configured?
I am using Debian Linux is it is relevant.
I raised a ticket on the official site and got a solution that seems to work:
Go to Settings | Version Control and map the repository root to the
Mercurial VCS.
Looks like Mercurial is supported in the community edition:
http://www.jetbrains.com/idea/features/editions_comparison_matrix.html?IC
Sorry, I use Subversion. But when I do, I have to check out the project from Subversion in order to get a working copy. Did you do that with Mercurial? Or are you working with your original files?
I'd do this:
Back up your original source. God forbid you should lose a repository named "PHD".
Check the code into Mercurial. Make sure you can see it in the browser.
Blow away your original source.
Open IntelliJ and check out from Mercurial.
You should be able to see changes added to the change list as you work.
I had to edit the .idea/vcs.xml file to get it working.
The VcsDirectoryMappings needs to read something like:
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="hg4idea" />
</component>