I'd like a quick way to know how many conflicts I will need to merge manually. Is this built-in? Or is there an existing tool to use as the merger to just count this? ...
Hi there. Am having problems removing a file from Tortoise. I make the clone, and there are a few test files which I want out. What is the proceedure for removing a file from the repository, thanks in advance, ...
I have a local repository, let's call it ONE. ONE is the actual program. It's an android program, in case it matters for some reason. I have a remote repository, let's call it EXT. EXT is somewhat a library, used by ONE. ONE has a complex directory structure, mandated by android. The main sources are in src/bla/bla/ONE. Since ONE uses ...
I know that sub-repositories save you an your team time, but what is the ROI on them? http://mercurial.selenic.com/wiki/subrepos ...
I know the question has been asked before how often to commit with a DVCS. All answers have one thing in common--as often as possible. But they're usually something like, after finishing a thought, a user story, getting code that compiles, or passing tests. I was thinking, given that a DVCS gives you you're own repository, with very chea...
I tried using the plugin from app Changes, but it doesn't work, it says "No SCM found". Does anyone have a way to integrate Mercurial into Coda or know how to solve this problem? ...
Has anyone managed this problem? All other Mercurial facilities are working fine inside VS. ...
Hi, Can you please tell me where I can find a 'gitk' type of tool for hg on ubuntu? I have tried '$ sudo apt-get install tortoisehg' but I get this: $ hgtk abort: This version of TortoiseHg requires Mercurial version 1.3.n to 1.4.n, but finds 1.5.2 ...
I'd like to be able to send all the contributors working on a project a message whenever a commit is made. This way, everyone sees the contribution, and hopefully someone will take a look and spot bugs and whatnot. Furthermore, it provides our bosses with a nice and simple, if a little incomprehensible, way to get an idea of how the proj...
I would like to embed an actity graph created by hgactivity inside my hgweb webinterface. What's the best method to do so. Here's a screenshot of a hgactivity graph: It shows the number of commits through time to a Mercurial repository. ...
I have used Puttygen to create a public and a private key, and then is ready to let TortoiseHg on Windows 7 do a clone by going to ssh://[email protected]/somecode but there seems to be no where to add the private key to TortoiseHg? (or even just the mercurial command line) The file is already some where on hard disk as s...
the diff result in text might be hard to get used to at first. Is there a way to pipe that output to a visual diff tool, such as something like $ hg diff --visual code.rb or $ hg diff code.rb | sometool so that the result can be viewed visually? ...
I am starting on a new Hadoop project that will have multiple hadoop jobs(and hence multiple jar files). Using mercurial for source control, I was wondering what would be optimal way of organizing the repository structure? Should each job live in separate repo or would it be more efficient to keep them in the same, but break down into fo...
I'm in lean startup mode, working on a simple phone app that will be published initially as a iThingy app and an Android app with, possibly, Blackberry and Symbian versions to follow. I'm about to go from no repository to needing a central repository that up to 4 very part-time resources will be sharing. Two of us have no version contr...
I had 2 Python similar scripts, that I've since merged into one (and now takes some parameters to differ the behaviour appropriately). Both of the previous files are in the tip of my Mercurial repository. How can I indicate that the new file, is a combination of the 2 older files that I intend to remove? Also note, that 1 file has been ...
If I have a rather large Mercurial project locally, and wish to experiment, can I safely just make a local copy of everything and work there? For instance, let's say I do this: Clone the repository from a central server to a local directory Make some changes, commit them locally, do not push Make a copy of the directory locally Make s...
I discovered earlier tonight that files and folders I have removed from my C# projects are apparently still on disk, even though my Visual Studio Mercurial plugin seems to do a good job of deleting them when I delete them in Visual Studio. It must have hickuped when it came to these files. So I wondered... Does anyone have a script or s...
I would like to use a GUI app on my Mac (Changes http://connectedflow.com/changes/) to resolve merge conflicts when using Mercurial via SSH on my server. What is the most straightforward way to achieve this without cloning the repository locally? ...
Found myself quite confused today about this. I create a blank repository locally(hg init), cloned it to working copy, added some code, commited and pushed it(to local repo obviously). Now I need to share that repository with others. There is a server that has mercurial on it, how do I clone my repository to a remote one such that othe...
(I am a relative newcomer to TortoiseHg, so bear with me :-) I use TortoiseHg on two machines to talk to my remote source repository. I made changes on one machine, committed them, and attempted to push them to the remote repository BUT I forgot to first do a pull to get the latest code first. The push gave me a few lines of output, sugg...