We are moving to Mercurial from Subversion. With Subversion, we have http://trunk.myproduct.com for testing purposes. I am wondering what the standard name for a trunk-like site is for Mercurial. 'trunk' seems like a Subversion term. http://default.myproduct.com is the most obvious name, but is that what people generally use? I am lookin...
I am able to publish the list of repositories using hgwebdir.cgi on Tomcat. However none of the links on the published repository work. What should the baseurl be set to? I set it to http://host:port/folder where the cgi-bin is right under the folder. The urls dont form correctly (dont have the hgwebdir.cgi in them) and i have no url rew...
I trying to like mercurial, but is driving me nuts. I convert from SVN to it thinking in the promise of better workflows. Also, I use git in contract work, so I get the whole distributed idea. I choose mercurial for the promise of more simplicity and better windows support. I'm a solo developer right now, working in a project that comp...
I have a centralized Mercurial repository which I want to provide access to via SSH. I did a chown root:developers repository -R on the repository directory, so all users in group 'developers' should have access. So, I clone, add my initial files to the repository as user A, commit, push, done. Now, I go as user B, clone, add a file, c...
What would be the best approach for versioning my whole database ? Creating a file for each database object (table,view,procedsure..) or rather having one file for all DDL scripts and any new change will be put in a separate file ? What about handling changes made in a Database manager tool ? I'd like to have a generic solutions for ...
When I try to hg rebase -s 1775 --collapse, I am asked to merge all the files I touched since rev 1774. How can I avoid that? Details I am just learning how to rebase. I successfully tried the example given here, and a few minor variations. However, in my own repository, when I try the same steps, I am asked to merge a boat-load of ...
I've been struggling to get Mercurial working with Apache on Windows XP. I've read and tried the suggestions at the following SO threads: 1, 2, 3 & 4 So far all I can is a blank page and when I view the source I can see: <body bgcolor="#f0f0f8"><font color="#f0f0f8" size="-5"> --> <body bgcolor="#f0f0f8"><font color="#f0f0f8" size="-5...
I tried to merge two heads in Mercurial. After merging, I didn't commit and did some more changes. Then I tried to commit and got the following message: abort: cannot partially commit a merge (do not specify files or patterns) I'm using TortoiseHG as visual shell, and Beyond Compare for comparing and merging. And I'm relatively new to ...
We have several shared libraries that exist as subrepos in a parent repo. If a person clones the parent repo, it looks something like: /ParentRepo ---- .hg ---- .hgsub ---- .hgsubstate ---- SharedSub1 ---- SharedSub2 ---- SharedSub3 ---- SharedSub4 ---- ParentRepo.sln .hgsub looks like this: SharedSub1 = http://ourfogbugz.us.com/.......
I have a mecurial server setup and would like to use it for source control over apache. The setup i followed, however, requires that I have a .htpasswd which it uses to authenticate mecurial users. Is it possible to have this authenticated list be the people who are already users on the server so they don't have to create new id's and p...
My company is switching to Mercurial, and we're coming from Subversion. We're noticing that we're having to do a LOT of merging in our workflow. For instance, if I change a file, commit, pull, update, push, and then my co-worker changes a file, commits, pulls, and updates, he gets a "crosses branches" error and has to do an hg merge. We...
I'm playing with Mercurial 1.6 under Apache 2.2.15 on a Windows box under a Windows domain, running as a central repo server to which select people will have commit permissions. I'm trying to restrict access to Mercurial by restricting access to Apache's /cgi-bin/ to select users via sspi_auth_module. If I browse to the repo page with ...
I just installed Mercurial 1.6 on my MacBook running Mac OS X 10.5.8 "hg" shows me help text in what appears to be a random mix of English and German, "hg -v" shows text all in German. Why? I am, in fact, in Germany and my Mac has a German keyboard. I have Germany as the system locale but English as the language. I speak fluent German...
I've got a web application I want to be able to create patches for. Specifically I want to create patches for enabling specific functionality in the web server. JAVA_OPTS="-Xms128m -Xmx256m $JAVA_OPTS -Djava.awt.headless=true -Datlassian.standalone=JIRA -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true " # Perm Gen size nee...
As part of my release process, I want to create a zip file that is basically a dump of the hg working dir at the time of that particular release. What's the easiest way to do this in an automated way? BTW, if I simply "zip -r proj.zip" the zip will contain all sorts of things I don't want -- like compiled files, emacs auto-backups, and...
I want to know what changes I made, without looking at the 30 other files that other team members modified. So when I hg out, it said the first changeset to push was 4821, so since then I have pulled, merged, and pushed a couple times. Now I want to make sure all the debugging code is removed. Is there a way to diff the current revisi...
Yesterday I setup Apache to serve my Mercurial repositories and got everything working properly. I then tested pushing changes back to this repository and was presented with an error, and now that error pops up for every single operation I attempt - even just a simple GET request of the repositories! Here is the error: mod_wsgi (pid=177...
With hg, how I can see in command line the branches graphs? Similar to git log --pretty=oneline --graph ...
I've started using Hg (Mercurial) as my SCM client, just to get my feet wet with it (I'm the only guy working on the project, so yeah, no need for the more advanced features yet). I've been going through the tutorial at hginit.com, but I've found a rather inconvenient aspect of the hg log feature. Basically, when I type it, I get the new...
Hi Guys, Mercurial newbie here, I have a simple question. I deleted one of my files from Mercurial and I want to get it back. I used to do svn up in Subversion, but in Mercurial it doesn't work, I tried hg up, and it does nothing. I tried hg up to a specific file, and surprisingly (to me..) it told me: abort: unknown revision '74656d70...