I am working on some bugs in our code base and I have created separate branches for each bug. I have rebased one of the branches on top of default. I generally use the mercurial plugin for Eclipse and I would do a push (when I am in the default branch). This pushes my changes on the default branch. I tried to do the same thing with Tort...
I have been working on a branch and have made some commits. Now is there some way I can see in TortoiseHg if those commits have been pushed or are they still just local? ...
I'm a web developer / designer, and I want to be able to version control graphic files (Photoshop / Fireworks / Illustrator / Stock Photos / etc). This would normally be fine but some of the files I have tip the scales at around 800MB, which TortoiseHG chokes on. I currently have a server I put all my files on so all my computers can ac...
My colleague has committed twice on his repository on the wrong branch. What is the most effective way to take those two commits, get rid of them and then commit them correctly under the right branch? (the changes have not been pushed) We'd ideally like a way to do this from within TortoiseHG but of course, we'll use the command-line i...
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 ...
It seems that on the page http://mercurial.selenic.com/wiki/OtherTools TortoiseHg is recommended most for a PC and MacHg is for the Mac. What are some experience of using them if somebody can share? It seems that Murky for Mac need compilation and sometimes it needs a bit of work. I was also thinking of setting up a virtual mac...
I created a project with Google Code, checked it out from https://stackexchange.googlecode.com/hg/ using the TortoiseHg shell extension in Windows. Then I committed a new file to the local repository and I wanted to push my changes to Google Code. It asks me for my username and password and I give it my Google login (@gmail.com) and pass...
When using the hg serve command in windows, the server starts correctly, but when somebody tries to do a clone, this error appears. $ hg serve listening at http://machineX:8000/ (bound to *:8000) ---------------------------------------- Exception happened during processing of request from ('127.0.0.1', 4456) Traceback (most recent cal...
Occasionally I commit some code to the repository, add a comment/summary, then read the summary back and realise I've made a mistake or should have included a bit more information. It is possible to edit the summary after a commit in TortoiseHg? I'm using version 1.1 ...
Sometimes I have to return to a really old branch when I depended on a ton of external libraries. Updating to the current branch removes the source files for those dependencies, but the artifacts are left there, as well as a few folders and such. I would like to have a way to force a mercurial repo to be as if I had just cloned it from ...
Does anybody know why hg status is slow (3-10 secs) the first time it's called from the command line on a windows client (I'm assuming it is cached after that). hg status is a local operation and it should not take that long especially with empty repos. This is the case on both an active repository with several changes and a brand new ...
I am a new user administrator of the HG Mercurial repository for our company. This is version 1.1.1. We have a Python script containing our source directory right now. Currently, the repository/store is: http://summer2010dev.just5clicks.com/hg/hgweb.py But this script only contains one working directory and I do not know how to ...
Possible Duplicate: Is it possible to edit a summary after a commit using TortoiseHg? In Mercurial, if I forget to include the defect # in a check-in summary, how do you change the summary of a previously checked-in changeset, besides tweaking a flat-file and checking in a subsequent changeset just to comment on the previous c...
I created a C# project and added it to source control (mercurial). I can edit files in VS, commit it and push it using TortoiseHg. It goes to the server. When some one pulls they get the files. In my visual studio I added a folder and a file inside that folder. I used TortoiseHg and it saw the new file in the new folder. I committed it ...
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...
Say one cloned a repository and his main job is to edit it locally. What is the proper operation to follow so that he can just merge with the initial upstream while keeping his changes? i.e. like 'Update' in TortoiseSVN. ...
I just switched over from SVN where after a few changes to the trunk I would merge a range of revisions (from my last merge from the trunk to the branhc - HEAD) into a branch. I want to do the same with Mercurial using TortoiseHG but I can't figure out how. I just committed two changesets to the trunk, now I need the branch to integrate ...
I have the habit of diff'ing all the changes I made before pushing to any repo. But I found that if I never commit for that period of development, such as for 5 days, then I can merge with other people's code, do testing, etc, and I can diff or kdiff3 and see all the changes I made, remove any debug code, fix any small things, and then ...
When I clone the following project http://code.google.com/p/signal-detector/source it comes in the revision marked as default, that isn't the latest nor the tip revision. I tried many merges to make the latest revision to become default, but I couldn't. How to do that? ...
Being used to how ClearCase draw graphs I find Mercurial's and TortoiseHg's way confusing at first glance. This is how I'd like it to be represented. With static positions for branches. E.g. Maintenance branch to the left/right always and preferably in a straight line and not the current spaghetti curved branch it is now (see below link...