I'm using Mercurial and I'm trying to merge changes into my main repo. Some of those files in my main repo are write-protected. This makes the hg merge command fail with an abort: Access is denied. I want to make those files which will be affected by the merge writable, and only those files (not the whole repo). Is there a way to mak...
I've configured Mercurial to talk to Fogbugz as explained in their documentation. Should hg commit inform Fogbugz of the commit making the repository appear in the list of repositories and the commit message in the related bug as per the Bugz tag? ...
Inspired by Git for beginners: The definitive practical guide. This is a compilation of information on using Mercurial for beginners for practical use. Beginner - a programmer who has touched source control without understanding it very well. Practical - covering situations that the majority of users often encounter - creating a repos...
It's my first time using a DVCS and also as a lone developer, the first time that I've actually used branches, so maybe I'm missing something here. I have a remote repository from which I pulled the files and started working. Changes were pushed to the remote repository and of course this simple scenario works fine. Now that my web app...
I have WebDAV access to a filesystem where I can't write to the root of the filesystem, but can write to 2 folders beneath it. I'd like to: track my changes in a single DVCS repo (git/hg preferred) work directly on the WebDAV connection rather than constantly pulling changes into it (this would hurt my workflow quite a bit) Assume th...
I'm attempting to build mercurial 1.3.1. I've attempted this thus far on my Mac OS X machine and on a Linux Ubuntu virtual machine that I'm running. I keep getting errors while running the make. I know there are binaries availble for both Linux and Mac, but I want to build my own copy. I've always skipped out on building and I want to ...
I'm trying to make a web app that will manage my Mercurial repositories for me. I want it so that when I tell it to load repository X: Connect to a MySQL server and make sure X exists. Check if the user is allowed to access the repository. If above is true, get the location of X from a mysql server. Run a hgweb cgi script (python) cont...
If I start out with a local mercurial repo, which I consider to be the "main" repo (pardon me my dvcs lords), and intend to use bitbucket as a backup and issue tracking facility, I can do all my changes in my local repo and do an "hg push" to send the changes back to bitbucket. Don't I need to follow this "hg push" command run on my loc...
I'm trying to set up Mercurial repositories to be hosted by IIS under Windows Server 2003. Following this post I installed Python 2.5.4.4 and Mercurial 1.3, set up virtual dir, extracted library.zip and created hgwebdir.config. However, when I trying to open the http://hostname/hg/hgwebdir.cgi I got an error “The specified CGI applicati...
Hi, Let's say I have a local and a remote Mercurial repository. Now, I start working on a feature. I work on it, and when I think it's done, I commit the changeset. Testing it a bit more, I find that I could further improve this feature by tweaking something in the code. I make the change and commit. 20 minutes later, I find there's a b...
I think the title says it all - I want to easily tell which files where renamed when looking at the changelog using the tortoisehg UI. The out-of-the-box config only shows that a file was added/removed (i.e. the standard hg log message without the -C option). ...
Is it possible to delete all untracked files from my working directory? Let's say I added a bunch of files to my working directory, didn't add them via hg add, and now want to get rid of those new files completely? Thank you. UPDATE: Thank you guys for linux tips, unfortunately, I'm on windows, although I'm using PowerShell, so combin...
Which free source control system is most preferable with reason for home projects and documents? I am thinking to use Subversion (as I am familiar with it). Characteristic of home project: Most likely single person will be committing changes. (May be one day (not now), it is possible that I share a project with my friend who is in ot...
I have several repositories in my local machine. One is my main code, another is an assortment of useful code/tools. These are two fundamentally different repos. It might make sense to setup a new repo and pull these two in as sub-repos, but I want to wait until Selenic marks sub-repos as non-experimental before I do that. One of the us...
I am very new to software development, so this is no doubt a very basic question. I got a mercurial repo of an open-source project. I copied it and worked a bit. Commited. Worked more, then did second commit. So my tree looks like 1(from net) -> 2 (mine) -> 3 (mine) (changed numbers of course). Now I want a patch to send to the rest of ...
I have Mercurial 1.3 installed on my Windows 7 machine. I don't have python installed, but Mercurial seems to be OK with that. How does it work? Also, is it possible to force Mercurial run on IronPython and will it be compatible? Thank you. ...
Being very familiar with the subversion workflow and that fact that 99.9% of the time my computer is connected to the internet, I don't like doing 'hg ci' and 'hg push' separately. I remember bzr had a 'checkout' command that would bind subsequent 'commit' commands to automatically commit directly to the server ('push'). Does mercuri...
We are migrating from Clearcase to another VCS (probably either SVN or Mercurial). For companies that have made this transition, what factors did they find important in selecting another VCS tool, and what practices did they find eased the transition? ...
I am using Mercurial under Windows XP (using the TortoiseHg distribution) and I want to use NTFS hardlinks when cloning a repository. Out of the box Mercurial does not do this. I have read that a win32file python extension needs to be enabled. So far I have been unsuccessful in making this work (adding a win32file entry to the extensions...
I've been doing some development on a branch and realized that before it could be complete something else need to be done first. I decided that I would branch my current branch and do the requiste changes in that branch then merge them back together and then merge my working branch into default. Basically I expected this: | | + requiste...