I have a long standing problem: at work we're using mercurial as a DSCM, but we can't figure out how to keep our config files in sync. The problem is that we want to keep track of config files and want to be able to exchange the config file contents among developers, but every developer wants to have his connectionStrings section indep...
Hi, I've already tried hg2git through fast-export and I've already tried hg-git. Both with no success. hg2git actually worked, but I had to ask a friend who runs a Unix machine to do it. And that messed up all the linefeeds throughout the files. hg-git simply failed with some libzip compression error. Has anyone had any success conv...
The data set is 97984 files in 6766 folders with 2,57 GB. A lot of them are binary files. For me this does not sound so much. The daily data change rate is in the hundreds of KB on maybe 50 files. But I'm scared that subversion will become extremely slow. It was never fast anyway and the last time at v1.2 the recommendation was split...
I just started my first Mercurial project. I did a 'cd' into my source directory. Then I did this: hg init myproject But next I did hg commit -m "first commit" And all it reports is: nothing changed But when I do hg status It lists all of the source code in my project. What am I doing wrong here? ...
I have a project that I want to push to a Mercurial repository on Google Code. I initialized a Mercurial project locally and checked in the code locally. The only instructions I can find on the Google Code repository are for cloning: hg clone https://blahblah.googlecode.com/hg/ blahblah But I assumed that pushing should be similar. ...
I'm seeing the command 'pull' and wondering how that's different from a 'clone'. Both terms seem to imply retrieving code from some remote repository. Is there some subtle distinction here? ...
When I commit something in Mercurial like this: hg commit -m "username question" I see this output: No username found, using 'WindowsVistaAdmin@ChunkyMonkey' instead ChunkyMonkey is my Windows machine name and obviously WindowsVistaAdmin is the user that I am signed in as on this machine. How can I set the username to something mo...
I'm trying to get Mercurial going with IIS6 on Windows Server 2003 following the tutorial on this blog My setup is c:\inetpub\HG_web_interface\ and the folder containing repositories is in d:\HG_repo\ My hgweb.config looks like this [paths] test = D:\HG_rep\** [web] style = monoblue I tried pretty much every combination of forwa...
TortoiseHg allows you to email a patch file of your changes to someone, but does it support applying patches? If so, how do you apply a patch using TortoiseHg? Solution Thanks @Will Bickford for your help. I just found this feature listed as a TODO on the TortoiseHg site. ...
I've recently started using Mercurial and when I reverted one of my .SQL files, Mercurial performed a binary comparison. This obviously limits the visibility of the changes that were made, as there is no diff. Is there an option to set file types to do a string compare? I'm using Tortioise Hg 0.8.1 with Mercurial 1.3.1. ...
Recently I switched from SVN to Mercurial. Now I wonder how to realize my intended branching work flow in Mercurial according to good practice, hoping other developers understand what happens in the repository. This is the work flow: Usually I have a trunk/default branch where work on the current release series happens. Let's say that...
I am the CTO and sole developer for my company. I'm getting ready to hire our first developer and possibly a second within the next 6-12 months. I'm embarrassed to say that I've never used source code control as part of my workflow. I guess being a 1-member development team has allowed me to be a bit lazy. It's not that I haven't wanted ...
I have a little private Google code project. For a SCM I use Mercurial. And for the local build i would like to use nant. So basically: I would like to download my source files from a known mercurial repository using a nant task I would like to somehow get the revision number of the repository so that I can assemble a nice little asse...
I am working in branch Feature and another developer has finished merging his branch Feature2 with Default. I would like to simply pull one of the files from the now default branch to my branch, before merging my feature (as it is not complete yet). ...
OK, this is driving me absolutely crazy. I've been all over google and SO looking for someone who has asked this question, but am coming up completely empty. I'll apologize in advance for the lengthy round-about way of asking the question. (If I was able to figure out how to encapsulate the problem, maybe I would have been successful ...
Which version control system would you recommend for: single user looking for simple, easy to use generally small simple projects working on windows usually coding python no server Use would be more finding old code than complicated branching situations. From other similar posts, Bazaar and Mercurial seem the best distributed versio...
Anyone know how integrate ExamDiff with Mercurial? I have KDiff3 set up but couldn't figure out how to set up ExamDiff. Update: Per accepted answer, this .hgrc config worked: [extensions] hgext.extdiff = [extdiff] cmd.examdiff = C:\Program Files\ExamDiff Pro\ExamDiff.exe Can run ExamDiff with the comand hg examdiff ...
I am working on projects for different clients using Mercurial as a VCS. I know how to set a default user, but is there a mean to set a different user for each project ? ...
I've started using Mercurial for version-controlling my Drupal project source files (I'm both a VCS and Mercurial newbie). However, the database is still "version-controlled" using a directory of dated .sql.gz files. What I want is to have a single database dump file somewhere within my repository, that would be overwritten with a curre...
I've been using Mercurial but would like to do a quick demo of Git. What are the Git equivalents of: hg init . # start a project in the current directory hg addremove # look for any added or deleted files hg commit -m "comment" # commit any uncomitted changes hg status # what have i changed since the last commit? ...