I came on board about 6 months ago, and when I arrived, my group was using NO form of versioning. I have since convinced mgmt to use Mercurial in new projects, so we have on our webserver the following structure: -MainFolder (which includes files for the main project) +Subfolder A, which contains (old) project A with NO hg repo +Su...
Hi, I am looking to remove a directory from local and central repository. I managed to do it locally by hg remove name_directoriy hg commit However, after pushing my changes to the central repository the deleted folder is still in the central repository while it is gone locally. How to remove directory in central reposi...
I am trying to install latest mercurial on fedora by doing sudo yum install mercurial . But doing so I am getting mercurial 1.1 that is not latest release .Current mercurial release is 1.6+ . Any help is highly appreciated ...
I am coding a website using the Codeigniter PHP framework. I am using mercurial for version control. I have 3 systems I work with. I do my coding on a Windows 7 machine using Netbeans 6.9.1. I am occasionally making commits, and pushing to a repository at Bitbucket.org, purely for the purposes of backup and version control. I have a ...
We can use hg in -vp to compare our local repo to the master repo. How can you do this visually? We use the ExamDiff extension as our Mercurial visual diff tool. We figured there was a way to do the equivalent of hg in -vp but wasn't sure how to do this. ...
I want to keep my main .hgrc in revision control, because I have a fair amount of customization it in, but I want to have different author names depending on which machine I'm using (work, home, &c.). The way I'd do this in a bash script is to source a host-local bash script that is ignored by Mercurial, but I'm not sure how to do this ...
If we committed several times, for example, on our local repo, for revision 3000, 3001, 3002, 3003. If we push to a remote repo, it will push 3000 to 3003. Is there a way to push only 3000 and 3001? ...
I'm trying to get a Trac install working on a Centos box. I have installed Trac (v 0.12.1) and tracmercurial plugin (http://trac.edgewall.org/wiki/TracMercurial) rev #@9946. So far everything seems to be working fine EXCEPT when i go to the login page. I constantly get the error "Authentication information not available." My trac p...
Imagine this scenario: Alice and Bob both clones a central master Mercurial repository, containing 1 text file Both Alice and Bob makes a change to the same line in the file, and commits Bob pushes back to the central repository, but not Alice Alice now pulls into her repository, notices she now has two heads, and merges Since the merg...
Worked on my repo from work, and hg pushed the changes. Now in my home computer, how do I get the changes I saved from work considering I've already hg cloned the repo about two weeks ago but haven't updated since? I need something like a hg getchanges or something? http://bitbucket.org/sergiotapia/sharpdic ...
My company is moving from Subversion to Mercurial. One of the reasons is with Hg we hope to be able to work more independently. We are looking forward to using rebasing as our primary way to update from the main repository, at least in the beginning, to keep the history in one line, making the transition from Subversion easier. Right ...
Hello, Problem: One hg repository has a file I want to update & maintain in another hg repository, and I do not want to copy & paste. I do want to have the file available in both repos. Scenario: Working on Product 0001 Project A has an hg repository. Down the road, a Project B is spun up. There is largely no coupling between Projec...
I made a mistake and removed a file. I'd like to go back to my previous commit! I tried with revert and backout with had no luck... Any tip? Edit: I did exactly this: hg forget file hg commit -m "Blah" hg push The revision number of this last push is 17. Now file is not tracked anymore. I'd like to get it back to revision 15 (not...
I have a few odd issues with a svn repository I'm trying to convert to hg. Our repository looks more or less like this. proj_root ___ trunk \ \___ tags \_____ branches __A \ \__B \_____Q __ C \___ D Ideally I could specify --config convert.svn.branches...
I would like to ignore all files that start with: ._ How would I write this in the .hgignore file? ...
I am using mercurial for website development. I "think" I'm using it correctly. I develop on my development machine, commit fairly regularly. I will somewhat regularly push my commits to my hosted site-dev repository. If things are set up how I want them for the live site, I push from my dev machine to the hosted site-live repository...
I have a Mercurial repository with four branches in it. One is the "common" branch, the other three are "specific" branches which consist of some cosmetic changes applied to the common branch. One of those cosmetic changes consisted of renaming some files. So the common branch has "file.txt", and the first specific branch has "file-01.t...
What is a good workflow for using mercurial with two long-running branches that are slightly divergent (i.e. I never intend to entirely merge them back together)? In my case, this is CMS software that has been customized differently for two different web sites. I started with projectA, and once that was working cloned it to projectB an...
I have a hook function named precommit_bad_branch which imports hook_utils. When invoking precommit_bad_branch via a commit I get the following error message: error: precommit.branch_check hook raised an exception: No module named hook_utils abort: No module named hook_utils! It looks like I'm not allowed to call hook_utils from preco...
I've got some code under version control (using mercurial), and would like to share some of it, whilst hiding other parts which I cannot release into the public domain (at least at this stage). I'd ideally like to keep the revision history of the public code intact, and, more importantly, be able push/pull changes between the public re...