Using Mercurial, TortoiseHG, Win XP. I had a working directory with a number of files. Committed and ready. My syncing software [incorrectly configured] copied some very old files [from before I was using HG] into my working directory, overwriting many many hours of work. I wanted to go back to the last committed version, so I did "up...
I have following windows configuration: Windows machine "A" has mercurial repository. hg server is running on "A" http I created clone of "A" on windows machine "B" After adding and commitng my changes in to clone, I want to push these changes to machine "A". Tried TortoiseHg: synchronize -> Push option, but getting below error: pushi...
What were the reason for chosing Mercurial as a basis of FogCreek Kiln, a source control management system with tightly integrated code review, and FogBugz integration? Why Mercurial, and not other (distributed) version control system, like Bazaar, Git or Monotone, or creating own version control system like Fossil (distributed software...
What are some useful Mercurial hooks that you have come across? A few example hooks are located in the Mercurial book: acl bugzilla notify check for whitespace I personally don't find these very useful. I would like to see: Reject Multiple Heads Reject Changegroups with merges (useful if you want users to always rebase) Reject C...
My team has a local development network which is not physically connected to any outside network. This is a contractual obligation and CANNOT be avoided. We also have to coordinate with a team which located halfway across the country and, as previously implied, has no direct network connectivity to us. Our only method of transferring dat...
I am aware of Notify extension by Mercurial, but it always notify on any push action. What I want is that a notification only when a certain branch (say, "stable") is updated because I need others to take action when this happens. What's the easiest way to achieve this functionality? ...
I have started a Mercurial based project on google code. I have worked in subversion for sometime, but I am confused with what to do what in Hg. I would like help on the following: How do I initialize project (first on my local machine) (then from my local copy to google's server) How do I get my copy of a build from the server How do...
Hello is there a tool for git that allow to work with mercurial repositories F.e. for svn there is a git-svn package, that allows to clone/commit/update from svn and work in a git way.. So is there some tool for mercurial for that ? ...
We still use CVS, I use git and hg for my personal use though I'm still a novice at both, but I realize they're much more modern and better, faster, distributed, etc. It's just everyone is so accustomed to CVS that I feel a whole slew of issues could arise if I were to be the one that recommended and actually did the upgrading/porting/t...
I have main mercurial repository (A) with 2 folders "depot1" and "depot2" in Windows Machine Following configuration is done in .hg/hgrc file of A repo. [ui] username = praveen [extensions] hgext.acl= [hooks] changegroup.update = hg update pretxnchangegroup.acl = python:hgext.acl.hook [acl] sources = serve push pull commit Then I ...
I'm trying to configure Mercurial for use with both a windows server (freeSSHd) and client (both command line and TortoiseHG). I'm using the most recent versions of everything... all downloaded in the past few days. Using public key auth, I have been able to get connected to the server and I'm able to use plink to execute "hg version" ...
I have a pair of commits that should really be just one. If I was using git, I would use: git rebase -i <some-commit-before> and then squash them. Can I do that in mercurial? If so, how? ...
So I'm pretty new to version control but I'm trying to use Mercurial on my Mac to keep a large Python data analysis program organized. I typically clone my main repository, tweak the clone's code a bit, and run the code on my data. If the changes were successful I commit and eventually push the changes back to my main repository. I gu...
I checked out the codebase on my desktop computer and worked some on it. Now Im going away and want those changes on my laptop. One solution is to simply commit the incomplete code and then pull them on my laptop. But that would then mean that I have uncompiling code in the repos, something I would like to avoid. Whats the best way to ...
Hi All: I've got a problem when I try to sync files in two different repos. What I want to do is: I've got 2 repos A and B, and they share some common files, suppose they lie in A/docs/common/ and B/docs/common. So when I write some new docs in A and I want to update it to B or vice versa. How can I do? I try this: I write a .hgignor...
I'm currently trying to evaluate Mercurial, to get a feel for the philosophy the system tries to promote - but one thing that's got me confused is the presence of the bundled 'extensions' and how they fit into the mix. In the core package, Mercurial ships with a bunch of functionality that is implemented as extensions but is disabled b...
I have a number of branches in a git repository: david@Panama ~/app: git branch -r origin/HEAD -> origin/master origin/master origin/newButtons origin/newFonts origin/serverView If I try and import this git repo into mercurial: david@Panama ~/: hg convert app ... david@Panama ~/app-hg: hg update 388 files updated, 0 files merged, 0...
Is it possible to clone part of a Mercurial depot? Let's say the depot is quite large, or contains multiple projects, or multiple branches, can I only clone part of the repo? E.g. in Subversion, you might have trunk and branches. If I only want to get trunk (or one of the branches) I can just request [project]/trunk. If I clone the hg r...
mercurial-server manages user database under keys folder. Users and groups are represented by files and folders. AclExtension relies on linux user group through ssh. they don't seem to match. or did I miss something? I have managed to make mercurial-server work. but just don't see how to integrate AclExtension with it so I may have f...
Here's the deal: I just started a new job, and source control here is basically useless. All of the devs (about 10 guys) test their code in the same dev site, and there's no way to test a change other than commiting the change to SVN, and then it automatically gets updated in the dev site. (Let's not even start talking about the headache...