I have a big named branch with a lot of changes. Some of these changes are non-destructive so I want to pick these specific files out first, and merge them with default as soon as possible. (Then later, the destructive changes are merged as well.) In Git I would create another branch and squash all changesets outside of the index, then ...
I've recently set up a mercurial repsoitory. All pusing is done via ssh. Currently only users with an LDAP account can push changes to the repository. However, given that when commiting to a local repository any commiter name can be used using the --user. It is possible to have the situation where a commiter name does not match the LDAP ...
I'm trying to implement Mercurial in the company where I work. Previously we used ClearCase, but for various reasons we decided to upgrade to Mercurial. The development team is very accustomed to the ClearCase workflow, especially the visual tools. Therefore, for our implementation of Mercurial, we will be using TortoiseHg. A Mercurial ...
Yesterday I committed a file and then wanted to hg backout, but Mercurial says cannot backout because I have other modified files in the project… That's a little bit strange… it is not atomic level on each file? Commit 1 file and then backout 1 file? Second, I can save a copy of those modified files A, B, C, to tmp files, hg revert th...
Have a scenario where we un-intentionally merged a named branch (ABC) into our default branch. hg rollback is not an option because there have been a couple commits since. Is there a way to undo this? ...
Let's say the repo I have on my notebook's hard drive is cloned from a remote Repo2 initially, the "all serious" Repo, and then we use Repo1 for tmp storage and code sharing. So now, what if I do a hg in ssh://[email protected]//code/repo1 and then also on repo2, and see some new changesets on both repos, how do I look at wha...
I know about hgtk log command but it is working for directory not for a file. If I execute something like this hgtk log -R D:\bmutilities\big_repo\chrome\content\br_editor.js It throws an error saying---directory not found But if run hgtk command in D:\bmutilities\big_repo\chrome\content\ directory hgtk log -R br_editor.js it wo...
Is there any way I can enter a particular filename - e.g. "xyz.txt" - and search for any checkins of that file within a Mercurial repository using TortoiseHG? If not, why not? Isn't this what version control is for? ...
I'm new to Hg. I have a feature that was working, but now isn't. I want to progressively revert changes until I get to a revision where it works. I'm not quite sure what the best way to do this is. I tried cloning the repo to an old revision, and saw that it worked there. So... how now do I update to subsequent changes? In the cloned re...
I am trying to execute hgtk log command for a particular file. But you cannot do it until you are in the repository directory. something like this... process.initwithpath("cmd.exe"); args = ["CD","c:\\MY_REPO"]; process.run(true,args,args.length); process.initwithpath("hg.exe"); args= ["hgtk","my_file.txt"]; process.run(true,args,a...
I comitted few times with mercurial and pushed my commits. Nobody else pulled them. How can I "throw away" these commits to restore my local and remote repo (both repo and working dir) to a specified commit? Thank you. ...
I am trying to combine two repos but I get error "repository is unrelated".. Any workaround ? ...
I want something in git that is similar to Mercurial's Bigfiles Extension (note: I know of git-bigfiles, but that is unrelated). Basically I want to store large binaries in my git repository, but I don't want to get every version ever of the large binary when I do a clone. I only want to download the large binaries when I checkout a spe...
I am using firefox extension to run hg commands on my repository. But when ever I execute any hg commands it shows command prompt window for a split second and closes it. Eg:- process.run("push"); process.run("update"); Is there any way to not show that window at all ? ...
Supposing I have following scenario: I cloned some open-source project, say from URL X. Now I have local clone of it. I made some changes to local clone to try things out and commited them locally. Now what I want is following: I want to get update from the open-source project X. Just get all its latest code, without my changes at all...
I have a site/backoffice solution that works with this structure: /bo // mercurial repo /site // site files /www/admin // mercurial repo /var // site specific vars The backoffice works seamless across several sites and therefore all projects have a mercurial repo and code contributions done to project A always ge...
Hello all, I am maintaining a project on googlecode. I am using svn and I am happy with that. However, a new contributor would like to use Mercurial. I am ok with this this because I think that it is a better choice when working with different people. So I am to the point to migrate my googlecode project from svn to hg. I would like ...
Hi, I'm working in a team of 3 developers and we have recently switched from CVS to Mercurial. We are using Mercurial by having local repositories on each of our workstations and pulling/pushing to a development server. I'm not sure this is the best workflow, as it is easy to forget to Push after a Commit, and 3 way merge conflicts can ...
Hello, I'm a new mac user and recently installed mercurial on it. Id like to enable a few extensions and am looking for the global hgrc file. I could'nt find it, so i tried creating "hgrc" files in /etc/mercurial, and ~/.hg . It still does not work, so I was wondering if someone here had the solved the problem. Many thanks. ...
I have several projects that build reusable libraries. All these projects are under source control. When I use these libraries in a project I simply link to the same ONE version on my local drive. However as you can imagine, this can cause problems when I commit back, and a different developer tries to clone the repository. What is the...