Recently, I've started experimenting with Mercurial, due to the fact that it always attracted it because of its simplicity and "just works" principle. Or at least, that's how others always described it. They also usually described it as "practically the same as git with just a few minor changes you won't notice" - only for me to discove...
My Mercurial server requires https authentication for pulls. How can I cache my authentication information on the client without exposing a plain-text password on disk? I'm looking for something like http://stackoverflow.com/questions/2799460/using-sudo-with-mercurial-and-ssh-authentication but for HTTPS. ...
We are currently reworking a big part of our code base. We choose to create a separate branch for this since the rework will take several months and we should be fixing bugs and updating the default with new features in the meantime. Obviously we want our rework branch not drift away from the default too much. We decided to merge the de...
I remember 2 events in SVN history: TortoiseSVN got usable and VisualSVN got usable. The result of the first: "We will never ever want to use SVN with command line". The result of the second: "We will never ever use SVN & MSVS without VisualSVN" please understand this correct - we do use SVN command line if we need something that can n...
I've been asked this question about distributed source control in general by someone who's familiar with Team Foundation Server. Is it possible to use a DVCS such as Git or Mercurial for source control and comply with standards such as ISO 9001 or CMMI? What requirements do ISO 9001 and CMMI place on what source control tools should an...
I'm trying to deploy my Maven generated site to a googlecode project using mercurial. When I do a mvn site:deploy I get Transfer error: org.apache.maven.scm.NoSuchCommandScmException: No such command 'list'. Its like its trying to do a "svn list" even though I am using mercurial. In my pom I have maven wagon and mercurial setup (I ...
This is a cousin question with my earlier question of "How to manage concurrent development with mercurial", which covers individual developer workflow. The answer to this question will actually influence the choice for developer workflow. This is NOT a general "release management best practice" or CI question, as it has been asked many...
Hi, I've pulled the Subversion repository into a local Hg repository while at work. At home, I fixed some stuff, committed into my local Hg repository, and upon coming to work I did a pull and an update. $ hg pull $ hg update I needed to merge, so I did that. $ hg merge However, when I tried pushing: $ hg push abort: Sorry, can't...
Hi, We have an XML file which contains the settings of a tool we use. The tool is nice, but if you change some settings when using it it's quite easy to save those settings to the XML-file by mistake (you get a question, but it's easy to answer yes). Is there a way to alert the user someway that she is commiting a change to this specif...
I just switched over from SVN where after a few changes to the trunk I would merge a range of revisions (from my last merge from the trunk to the branhc - HEAD) into a branch. I want to do the same with Mercurial using TortoiseHG but I can't figure out how. I just committed two changesets to the trunk, now I need the branch to integrate ...
I hope this is OK to ask here instead of superuser since I get very little response there to very specific questions like this. I have a project that's under mercurial revision control and I'd like to move where it is located on my computer (from ~/workspace to ~/Dropbox/Projects). But if I move the project and then re-import it, it los...
I created private repository on bitbucket.org. I want to use it from IntelliJ IDEA. I choose "Check out from Version Control" and there is message box with field Mercurial Repository URL and Test Repository button. What should I enter into Mercurial Repository URL? I tried http://bitbucket.org/my_user_name/my_repo_name, https://, a...
How do I configure automatic push in Mercurial and Git? Sometimes I forgot to push in a computer, and when I move my location, I'm out of the sync with the good code. Is there a way to mercurial and git do this every hour, for instance? ...
've written two functions in a file commit_hooks.py that I want to run before any commit is made persistent, but I can't figure out how to write my hgrc to detect them. The function headers are: def precommit_bad_merge(ui, repo, parent1=None, parent2=None, **kwargs): ... def precommit_bad_branching(ui, repo, **kwargs): ... I've trie...
In short: How can I use Hg to synchronize repositories between two computers using a flash drive as intermediary? With more detail: I often develop code on computers that aren't networked in any way, and I transfer files between these machines using a USB flash drive. Now I would like to develop some software across these machines u...
I have switched our internal codebase to use Mercurial, with a hosted remote repository. I've read that using Mercurial over SSH instead of HTTPS is faster because the data is compressed before it is sent. But... compared to HTTPS, it's quite a pain to set up, especially on Windows. For those of you who have used both regularly on lar...
I have the habit of diff'ing all the changes I made before pushing to any repo. But I found that if I never commit for that period of development, such as for 5 days, then I can merge with other people's code, do testing, etc, and I can diff or kdiff3 and see all the changes I made, remove any debug code, fix any small things, and then ...
I will be more specific with a question if I need to be, or make this into a community wiki if you all think that's where it fits, but my question is: My dev team has recently started using Mercurial (moved from subversion) and we love it so far. I'm wondering if there is a 'best practices' resource out there about repository architect...
What version of Python is needed to run Mercurial? I see that the website says it requires 2.4. Does that mean 2.4, or 2.x? or something higher than 2.4, i.e., could I install 3.x? I've installed Mercurial without reading the requirements and I installed it anyway and hg.exe executes fine. Looking in the directory that hg.exe lives (C:...
I'm working on a project where I have a commit that introduced a feature with major problems that weren't discovered immediately. Now I want to completely remove that revision while keeping the work following it but i'm having a hard time wrapping my head around this 3 way merge. Here is a simplified graph of my project. o changeset: ...