mercurial

问题 Here our situation: We have two branches in our Mercurial repository lets call them Branch A and Branch B. Branch A is for the stable version of the code Branch B is for the development branch Everything that was modified in branch A has been merged to branch B. However now we came to a point where the code in branch B has several differences from branch A. We made some large code changes in branch A, merging these changes in branch B would be a real pain and actually we would like to make an

问题 Here goes: $ cat .gitmodules [submodule "utils/external/firepython"] path = utils/external/firepython url = git://github.com/darwin/firepython.git [submodule "utils/external/textile"] path = utils/external/textile url = git://github.com/jsamsa/python-textile.git While this was still a Git repo, I needed to run git submodule init , after which some magic happens. Since I've now converted the repo to Mercurial (using hgext.git extension), I don't know what to do. Is there an equivalent process

问题 I am trying to convert an SVN repository to Mercurial, but I'm having some troubles. These are the steps I've taken: (I am on Windows) Turned on "convert" in the extensions Opened a command window, and typed: hg convert http://myversioncontrorepositoryhere It says it's initializing the destination folder and then asks: Enter username for Administration at http://myversioncontrorepositoryhere: type my username then in Administration at http://myversioncontrorepositoryhere: I assume this is my

问题 We've been trying to use Mercurial with Cygwin (on Windows) but run into an error as Cygwin uses forward slashes and Mercurial seems to require backslashes. Is there a workaround? Example of issue: hg status M src\myfile.java hg ci src\myfile.java <-- Error: abort: srcmyfile.java: The system cannot find the file specified ?? 回答1: I don't have such a problem because I use two Mercurials: mercurial bundled with TortoiseHG for use in windows cmd shell (usually I don't use it directly but it's

问题 Mercurial noob here. I'm having a lot of trouble working with mercurial and files like xcuserdata and .ds_store and .git. I'm at my wits end. The current setup has a central repo that acts like a middleman. We push and pull changes to it. Commits were previously pushed that included unwanted files (xcuserdata, git, ds_store) before a .hgignore file was made. This has caused nightmares. What I tried: I tried ignoring the problem and letting merge handle it, but it causes branches on the

问题 As the definite guide aptly points out (search for "Tags and cloning"): When you run hg clone -r foo to clone a repository as of tag foo , the new clone will not contain any revision newer than the one the tag refers to, including the revision where the tag was created. The result is that you'll get exactly the right subset of the project's history in the new repository, but not the tag you might have expected. It means hg tags in your new clone does NOT show the foo tag. Same thing happens

问题 Normally, Mercurial will abort if I have a dirty working copy when I try to import a patch: $ hg import x.patch abort: outstanding uncommitted changes Is it possible to import it anyway? 回答1: With Mercurial 1.9, you can use hg import --bypass to apply a patch without touching the working copy. The patch will be applied on the working copy parent revision by default. Use the --exact flag to apply the patch onto the changeset mentioned in the patch header instead. 回答2: If you are using

问题 I exported a bunch of changesets from my local working repo after doing a pull from the server repository. To make sure the patches work, I cloned a fresh repo from the server and I tried to apply the changeset. Unfortunately, the import fails with this: applying G:\OSS\premake-dev\premake-dev_rev493.patch unable to find 'src/host/scripts.c' for patching 3 out of 3 hunks FAILED -- saving rejects to file src/host/scripts.c.rej patching file src/base/api.lua patching file src/host/scripts.c

问题 I am trying to clone some github repos locally with hggit. I am following tutorial instructions to do $ hg clone git://github.com/schacon/hg-git.git abort: repository git://github.com/schacon/hg-git.git not found! $ hg clone git+ssh://git@github.com/schacon/hg-git.git abort: repository git+ssh://git@github.com/schacon/hg-git.git not found! I know I have hggit because the following works $ python -c "import hggit" $ head -n1 `which hg` #!/opt/local/Library/Frameworks/Python.framework/Versions

问题 In Git, there is the command git remote show <remote> When properly configured, this will show you the status of the remote compared to your local repository, including whether there are pending changes in either. I can't find a similar command in Mercurial. Am I missing something or does it just not exist? 回答1: Perhaps hg summary --remote? 回答2: To compare local and remote repositories follow these steps: go to local repo folder (use cd path_to_local_repo) run "hg outgoing -p path_to_remote