I have a build set up in Teamcity that builds and tests a mercurial branch, and should then tag that branch. The building works correctly but when it comes to labelling it fails with the error "push creates new remote heads on branch 'default'". I find this slightly odd because the branch that is being used is not called default. ...
We'd like to switch up from SVN to Git or Mercurial at work, and Mercurial we would like to investigate first. I have installed Hg on my Windows machine and got the Eclipse plugin, but I don't get a perspective like I do for SVN inside of Eclipse PDT. Does this not exist, or do I have the wrong flavor of Eclipse? I would like to see m...
I'm new to Mercurial and want to write some hooks to prevent merging between certain branches and the like. I'm looking for some kind of tutorial that goes through the whole loop. I've looked at the API and these examples, but I still find it confusing. I've always been better at learning through a tutorial/workshop than by reading a ma...
Hello there. I recently acquired a MacBook. I compiled Mercurial 1.6.3, and set it all with NetBeans. The thing is, whenever I try to commit, and since I'm writing the revision message and my name with accented characters (in Spanish), I'm getting an error like: transaction abort! rollback completed abort: decoding near 'Naim? Batuta ...
Hi all, Yesterday I installed mercurial on bluehost by following the instructions found here.http://bugtracker.gttools.com/public/wiki/bluehost/Mercurial When I tried to clone one repository from kiln using : "hg clone kiln repository url/devel", to "/home/yoursuername/public_html/hg/repos/projectA" on bluehost, it is giving http erro...
I've been using Mercurial for a few weeks now and don't understand why when Mercurial comes to merge committed changes from two repositories it does it in the working copy? Surely the merge could happen without the use of the working copy removing the need to shelf changes etc. It just doesn't seem necessary to involve the working copy...
I did a merge, but then I stuffed it up, so I decided to revert back. I have tried to revert to one of the revisions I merged several times, but this doesn't work. It doesn't throw any errors, it is just that my current repository state is still shown as having two heads. I also tried deleting all of the backup files that reversion autom...
I'm struggling trying to sort out what the best-practice is for putting a project under source control when the project is written against a framework. In my situation I will be using Mercurial for source control. Most PHP frameworks have an 'application' folder where I'm supposed to put my code that interacts with the framework. So i...
I am currently using the commmand hg diffmerge -r 32 -r 30 myfile, but this only displays two windows, not three. How can I make it do a three way merge? .hgrc [ui] merge=diffmerge [extensions] collapse=~/.hgext/collapse.py hgext.purge= hgext.extdiff= hgext.graphlog= [extdiff] cmd.diffmerge=/usr/bin/diffmerge [merge-tools] diffmerge...
Originally my subrepo's were defined with an absolute URL in .hgsub, which is now causing some trouble. It makes "friendly dictator" workflow impossible since I want to use an intermediate server where users clone their working copies from. Then I would pull changes to the intermediate server before pushing them to the master repository ...
It is my understanding that a .tar file contains directories and other files, and a .bz2 is a file that's compressed with bzip2 compression. Therefore, most tarballs with bzip2 compression end in: .tar.bz2 Which is bzip2 compression applied to a tarball. However, whenever I download source code from a Mercurial webserver, either the...
I'm struggling to find the mercurial workflow that fits the way that we work. I'm currently favouring a clone per feature but that is quite a change in mindset moving from Subversion. We'll also have issues with the current expense we have in setting up environments. Using hg pull --rebase seems to give us more of a Subversion-like wor...
We just started using hg and we're using base tags for common modules in our system. I have a few questions about how tags work. (#1) When I add a tag using the following command, does it automatically check in the .hgtags file for me? hg tag MY_TAG When I add a tag for the first time, it adds a line to the the .hgtags file. When I d...
Hi guys, it's a quesion about mercurial. I'm not a unix - guy, but use a mercurial together with MacHG for my development on Mac. Yesterday I had to change my mac, I just copied my project folder with repository on new mac, but now I can't do anything with it in mercurial. I can open project in xcode and everuthing is fine, but if I try...
Having read this past question for git, I would like to ask if there exists something like that, but can be done programmatically (file list) on each machine; works for Mercurial. The reason for this is that I would like to include in my public dotfiles repository some configuration files that store password in plaintext. I know I co...
I have a server which serves a "central" Mercurial repository; the team clones it and pushes their changes up to it via ssh. Hudson is installed on the same server (RHEL 5.5). I wish to trigger a Hudson build whenever anyone pushes to the central Mercurial repository. I also wish to send a notification email upon a push. In ProjectName/...
There are formats that are actually zip files in disguise, e.g. docx or odt. If I store them directly in version control, they are handled as binary files. My ideal solution would be have a hook that creates a foo.docx/ directory for each foo.docx files before commit, unzipping all files into it optionally, have a hook that reindents...
Say I have a repository on another machine whose entire history is to big to clone locally. If I have no intention of submitting any changes back to that repository, there's no reason that I shouldn't be able to just take a snapshot of the tip. Is there a way to do this, or am I going to find myself working around this with an rsync ha...
I made a big oops, and could use some help undoing it. We have two repositories-a fairly stable repository, and a repository we're working on changes in. I just made a defect fix in our stable repository, and was moving it up to the working repository. I pulled from the stable repository, merged, then accidentally pushed to the stable...
Hello: I'm working on deploying a Python module composed of several dozen files and folders; I use Mercurial for managing the software changes. I want to keep the same module in three branches: the official one (which the team uses), the development one (this may be more than one development branch), and the testing branch (not the tes...