Working on a bit of a sticky problem and was hoping for some help from the community. Basically, our dev team is split up into two teams, lets say "Red" and "Blue" 3 repos: 1: Master 2: Red >> Clone of master 3: Blue >> Clone of master Each developer is cloning red or blue on their local machine where they are working. Both teams...
Newbie alert! OK, I have a working central Mercurial repository that I've been working with for several weeks. Everything has been great until I hit a really bizarre problem: my central server doesn't seem to be synced to itself? I only have one file that seems to be out-of-sync right now, but I really need to know how this happened t...
I'm attracted to Mercurial as a DVCS platform, but would like an easy to use server similar to svnserve. There is HgServe, but that appears to be read-only. If I want to be able to host the server on another machine, it appears I need to set up apache, etc. Is that really the case? Is there an easier method for a local network where ...
How do you abandon all repository changes since the last commit in Mercurial? I don't think that this is the revert command, because that will actually update the working directory to the last commit. I just want to undo changes in the repository (added files, removed files, etc). But, I'm new with Mercurial, so I could be missing some...
Hi folks. I'm trying to move over some repositories from Perforce to Kiln (FogBugz's Mercurial-based companion VCS), and I'm having some issues. As Kiln does not port directly from Perforce, I'm going via the Perforce -> Mercurial -> Kiln approach, but I'm having some difficulties with the PF to Mercurial convert. I'm running hg con...
I like creating named branches in Mercurial to deal with features that might take a while to code, so when I push I do a hg push -r default to insure I'm only pushing changes to the default branch. However, it is a pain to have to remember -r default every since time I do do a push or outgoing command. So I tried fix this by adding this...
is this possible with Mercurial? and which Version Control system can do this besides Clearcase? ...
Hi, I have 2 branches in my hg repository: 1. default 2. new-feature I tried following this: http://mercurial.selenic.com/wiki/NamedBranches, I switch back to default by 'hg update -c default' but how can I merge my commits in 'new-feature' to 'default'. I did "hg pull new-feature", it said "repository new-feature not found"! Thank ...
So I have a mercurial repository that is the "blessed" repository that I will have open release cycle branches, for example Release1, Release2 etc. When a dev is working on a release cycle they will pull down Release1, then on their local machine branch for Bug1, Bug2 and fix those. What command sequence needs to happen for the devs to...
I am trying to get some information about the different pages served by the Mercurial cgi webpage. However I cannot find anything usefull. By accident I stumbled upon the raw-rev page. Anyone got some valid links to documentation? ...
Our team is just getting started with Mercurial. One of the first things we've started to play with is hg shelve. Locally, I have no problem shelving changes. It all works perfectly from what I can tell. However, when I try to unshelve, I get the restoring backup files message, but when I run hg diff, there are no changes, and my changes...
Hi, I have a project folder like this: project/ cow/ a.java horse/ b.java both a.java and b.java were modified. I navigated into horse/, and did: hg ci but for some reason even a.java got checked in, even though I was in a different folder, ugh. Is there a way to undo the checkin? I want to leave the files alone, ...
In MacHg, how do you select one and only one file from one folder and one and only one file from another folder to commit when you have other changed files in the same folder? In the command line it would be: hg commit folder1/file1 folder2/file2 -m "Message." ...
If not, is this a feature that git has? ...
I recently learned that I can get hg log to print the history in reverse order with: hg log -r : So of course I tried: git log -r : Well, it didn't work. So what is the command to do the same thing in git? ...
How do i run ssh-add key sudo hg clone [email protected]/etc/etc but use my ssh keys and not the superusers. Hey everyone, when i use sudo with for example, sudo hg clone [email protected]/etc/etc after i have added a key to my user account it doesnt work. I remember this is because the sudo is ran as the superuser but that user cannot h...
i'm using netbeans with the built-in mercurial support and want to omit a sub-folder from versioning. how do i do that? thanks! ...
I have a Windows Server 2008 machine (iis7) that has CopSSH set up on it. To connect to it, I have a Windows 7 machine with Mercurial 1.5.1 (and TortoiseHg) installed. I can connect to the server using PuTTY with a non-standard ssh port and a .ppk file just fine. So I know the server can be SSH'd into. Next, I wanted to use the CLI to ...
I'm hoping to integrate Mercurial into my Rails site. I want to run basic commands like status, summary, log, and maybe even clone. I'd like to interface directly with the Mercurial libraries and avoid doing any command line parsing via regex. Mercurial is written in Python; I am using Ruby. So, I need Mercurial Ruby bindings. It seems,...
I have two machines, A and B that both access an external hg repository. I did some development on A, wasn't ready to push changesets to the external, and needed to switch machines, so I pushed the changesets to B using hg serve. Changesets continued on B, were committed and then pushed to external repo. I then pulled on A and updated...