Hello, I am trying to use the convert extension in Mercurial to create a repository from a folder currently in our "Main" repository. I am using the filemap to move (rename) this new repository to a new location however it keeps copying over all files. I know in the filemap we can have an exclude but it does not seem to work. Sample o...
I am struggling with a perceived conflict between tracking all my changes so I can figure out where I broke the code yesterday, and having a controlled (high overhead) code review process that keeps things sane. I work in a very traditional ClearCase shop. All checkins require code review and I lack the authority to create private bra...
Folks, I'm using i**nternal:merge** tool since I'm not a big fan of GUI diff tools. I really like it and the only thing I find a bit confusing and not quite convenient is its behavior for binary file conflicts. It can't merge binary files and exits which is absolutely correct. However in the directory with the conflicting file "foo" it...
Going by the number of questions on this site for these three distributed version control systems, it seems like Git either is more popular, or is more difficult (hence requiring more questions), or has more features (hence requiring more questions). Or most probably a combination of the three. (Let's say that popularity on this s...
I could have sworn there was a way to keep a local ignore file in an hg repo, i.e. a file similar in function to .hgignore, but not checked into the repo. This could be used to ignore changes to an IDE project file if different IDEs are being used, for example. I'm having trouble finding how it's done. Does anyone recall the details? ...
Has anybody use gwsmhg GUI tool for Mercurial? Any luck running it on Windows? ...
I have decided to use Netbeans and Mercurial for my latest project (after no end of headaches with Visual Studio). My Mercurial repository is set up and I can do anything like with it, from the command line. Specifically, I can push and pull my code all day long by using an ssh:// login on the command line. However, when I use Netbeans ...
I am in the distinctly unfortunate circumstance of working in an environment which worries little of the deep evil known as "trailing whitespace"... But, alas, the enlightened Mercurial persists in warning me, by means of red highlights in diffs, that code I will be checking in contains this unholy thing. So, is there any way to tell Me...
You can use hg grep, but it searches the contents of all files. What if I just want to search the file names of deleted files to recover one? I tried hg grep -I file-name-pattern pattern but this seems to return no results. ...
We're a heavy user of SVN here. While the advantages of GIT over SVN made us want to change, the advantages of Hg over SVN mean it's now time to change and we need to start doing so very soon. I'm not so worried on the client side, but here are my questions. There are some excellent books on setting file metaproperties, properly organ...
I think I already know the answer to this but thought I would ask anyway: We have a file that got added to a Mercurial repository with sensitive information in it. Is there anyway to remove that file along with its change history without removing the whole repo? ...
Has anyone had any success importing TFS 2008 history into a new Mercurial repository? The only possible solution I've found to date is to go TFS -> svn -> hg using tfs2svn and then using the Convert Extension but I haven't tried this yet. ...
Hello, I have a problem which I can't seem to understand. I'm using TortoiseHg (version 0.7.5) on windows but on linux I have the same problem. Here it is: My .hgignore file: syntax: regexp ^[^\\/]+$ What I'm trying to achieve is to add to the ignore list the files which are in the root of the hg repository. For example if I have l...
Other than Tortoise HG, what is a good GUI client on windows? I've already looked at: http://mercurial.selenic.com/wiki/OtherTools ...
During merges mercurial leaves .orig file for any unresolved file. But after manually resolving problems and marking a file correct it does not delete the .orig file. Can it be automatically removed by some command? I work on a Mac so I can use something like: find . -iname '*.orig' -exec rm '{}' ';' and alias it or something, but I'...
I'm an experienced git user now working with people who use Mercurial. I really miss 'git gui' for helping me with my commits. I see that two tools, qct and hgct, both support Mercurial. The things I like best about git gui is that it shows all uncommitted files (and untracked files) and makes it easy for me to add whole files or indi...
I have a very old project that includes the source from another project directly, instead of linking it as a library. Back in the bad days, when I was keeping everything in CVS, I had the external code on a vendor branch and did periodic imports. Now that my project is in git it would make more sense to include the external project as a ...
Hello I a xampp setup for php. I have created a new repository at D:/xampp/htdocs/cart and i am using Mercurial along with Netbeans. I am working on a locally and a lone developer. The cart is installed and works at my localhost hXXp://localhost/cart If I make a change to a clone repository, since it is not the directory which runs...
When I have two branches in Hg repo, how to merge only one file with another branch, without having all other files from changeset merged? Is it possible to merge only certain files, instead of whole changeset? ...
Let's say I have 5 revisions of a README file. How do I view them all in Mercurial? It would be nice to be able to limit the output, similar to: hg log -l 10 I'm using PowerShell, so combined solutions are also welcome. ...