We have a large base of code that contains several shared projects, solution files, etc in one directory in SVN. We're migrating to Mercurial. I would like to take this opportunity to reorganize our code into several repositories to make cloning for branching have less overhead. I've already successfully converted our repo from SVN to Me...
I have two branches in mercurial.. default named |r1 |r2 |r3 -------- named branch created here. | |r4 | |r5 | r6 | | |r7 | | -----------> | r8 How do I achieve this catch-up? | | I want to update the named branch from default, but I'm not ready to merge the ...
Problem: 19/06/10 Update: More evidence problem is server-side. Receiving this error on Windows 7 command line (see below for full traceback): URLError: <urlopen error [Errno 10054] An existing connection was forcibly closed by the remote host> abort: error: An existing connection was forcibly closed by the remote host When attem...
I understand the restrictions of rollback and the care required in its use (for example, http://www.selenic.com/mercurial/hg.1.html#rollback), but I just wondered why there is only 1 level of rollback. My guess it's a design decision and that the hassle of storing multiple previous transactional states to handle multiple levels of rollb...
I have a project, where I'm forced to use ftp as a means of deploying the files to the live server. I'm developing on linux, so I hacked together a bash script that makes a backup of the ftp server's contents, deletes all the files on the ftp, and uploads all the fresh files from the mercurial repository. (and taking care of user upload...
I've got a Mercurial repo set up like this, with a subrepo inside another subrepo: Root .hg .hgsub .hgsubstate Nested .hg .hgsub .hgsubstate foo.txt FurtherNested .hg bar.txt If I change foo.txt and bar.txt and commit from inside Root then all is well and all the nested subrepos commit. ...
In my web projects (Django framework) I typically have a few internally developed javascript files that are shared among them. These web projects are stored in seperate mercurial source code repositories. Here's the relevant directory structure: + static --+ css --+ images --+ js -----+ thirdparty -----+ mycompany --------+ shared_lib...
Using a Macbook, I am worried that if the hard drive is on the road and it goes bad, then 3 days of code can all be lost. So I actually have a tmp repository on our main server computer, and I can hg push to it. The dilemma is, I can't push unless I commit first, and from previous experience, we shouldn't commit unless we are ready to ...
hg backout tip seem to also revert all your files back to the older version. Is there a way to change it back to EXACTLY like before the commit -- that is, with several files "Modified" but uncommitted -- essentially, as if the "commit" was never done? (hg rollback is said to be very bad and usually shouldn't be done for version contro...
In Mercurial, many of the extensions wrap their help/syntax string in a call to an underscore function, like so: _('[OPTION] [QUEUE]') This confuses me, because it does not seem necessary (the Writing Extensions instructions don't mention it) and there doesn't seem to be a _ defined in the class, so I'm wondering if this is some spec...
Hi folks, I've got a fork of some Codeplex project. I wish to update my fork with the latest code in the official code (is that the trunk?). How can I do this? I'm also using TortoiseHG on Win7 x64. Thanks :) ...
Admittedly a misleading title, but I didn't know how to put it better. So I made the mistake of pushing all my project specific changes BEFORE I opened a branch. That way, there are some changeset sitting in the default branch that does not belong there. They should be in my newly opened branch. Do I have to backout all the changes...
I was wondering if it was possible to pull a private mercurial repo to a server without access to hg. I have SSH access, but do not have the ability to install HG. I was thinking some kind of Python script that used http access or something, but I wasn't sure. I was also thinking this might only be possible with public repos. I am curren...
I am working on a project with developers around the globe and we are using mercurial for our source control solution. Currently, we communicate our change sets by creating bundles and posting to a mailing list. A disagreement has arisen about best practices, and we have not been able to find an answer in the mercurial documentation. Wh...
We've got a subversion repository set up like this: Repo A Sub-Project I Sub-Project II Repo B Repo C Recently, I've been tasked with piloting a Mercurial replacement solution. However, my project (Repo A\Sub-Project I), still needs to exist within Subversion, as that is what the build process uses (and can't be modified at the...
I have been trying to install Mercurial on a GoDaddy deluxe server which I have ssh access to. It fails because the server does not have GCC installed and I do not wish to attempt to install it. GoDaddy support said I need to compile Mercurial locally and move it to their server. Could anybody refer me to some resources on how to compil...
As far as I know all distributed revision control systems require you to clone the whole repository. For this reason is it not wise to put huge amounts of content into one single repository (thanks for this answer). I know that this a not a bug but a feature, but I wonder whether this is a requirement for all distributed revision control...
Is there a way to link every HG commit to a specific bug tracking issue? For example, show a drop down when committing from TortoiseHg with all active JIRA issues assigned to the current user (similar to the TortoiseSVN Plugin for JIRA). Maybe a drop down is too fancy, but is there something similar to the TortoiseSVN Integration with B...
When do I use update vs merge? If I do a pull from a remote repository, I'm reading that I have to do update to get those changes into my working directory. But others times I'm reading that I have to do merge. Do I maybe want to always do an update after a pull, and then do a merge only if there are conflicts? What am I not understa...
I’m just getting started with Mercurial, and I’ve read Joel Spolsky’s Hg Init tutorial, which I liked. I’m wondering: let’s say I have a private repository and I work on it for about a month. Then I decide I want to centralize it or make it public, like on bitbucket.org. I want to retain all the history. The intuitive thing would be ...