mercurial

问题 I created public and private key with cygwins ssh and pasted the public key into bitbucket account. ssh -T hg@bitbucket.org says the ssh connection works fine! (so it should work!!!) Then I post [ui] ssh = C:\cygwin\bin\ssh.exe into mercurial.ini in TortoiseHg And I post [paths] default = ssh://hg@bitbucket.org/myusername/personal Into the hgrc file. But then when I want to push TortoiseHg says to me: remote: Permission denied (publickey). no suitable response from remote hg Seems to me

问题 I branched off changeset "A". Later, "A" was merged into default. Then it was decided that "A" was not ready to go live, so someone hg revert -a 'd it to an older revision and pushed that. Now I'm trying to merge default into my branch, but because those changes were reverted, they're all being ripped out of my branch. I want to force a re-merge with "A" so that I can get all those changes back. How can I do that? Update: I just tried backing out the changeset that undoing "A" was made on. It

问题 I'm trying to set up Jenkins to pull from a bitbucket repo (on Windows Server 2008). I've generated a key, uploaded it to bitbucket, configured Mercurial to use Plink, am running Pageant, and can clone from the command line. When I set up the Jenkins job, it tries to clone the repo but just hangs with the "working" icon in the console output Building in workspace <workspace> $ hg clone --rev default --noupdate ssh://hg@bitbucket.org/user/repo <workspace> <spinning working icon> If I clone the

问题 My other question here just got answered about why pip svn+ was always re-downloading entire packages. Now I have a handful more packages in my pip_requirements file that always get downloaded instead of detecting that the package requirements are satisfied. They are the following types: git+git://github.com/yuchant/django-jinja2.git hg+https://bitbucket.org/yuchant/django-storages With svn+ my packages are detected as satisfied regardless of whether I specify trunk or a specific revision. Is

问题 Let say I had a feature branch called feature_x that was worked on, then changesets cherry-picked and transplanted to default, then the branch was closed. Not the best flow, but it's Mercurial, so there is no way of changing the history. Now I'm going to work again on the feature X, and I feel reusing feature_x branch would be least confusing. However, if I reopen that branch and merge default to it, I've got two problems. First merge conflicts, second changes that were modified in that

问题 How to export patch for a single file without committing first (working directory)? this is a possible duplicate, but my question is a little different and that question does not exactly give me a solution for my problem. Also, If I copy a patch how can I use it later? Plus it can be done with a commit only, yes it's a local commit and I can revert it later but is there a easier way? 回答1: hg diff -g filename >patch will generate the patch. The file can be in the modified or added state, but

问题 Hey I would like to ignore cache directories and the sub-tree of them everywhere. I tried the following: syntax: glob **/cache/** It seems it is not the right thing to do. Would somebody shed some light? 回答1: If you're wanting to ignore everything in and below the cache folder the following should work: syntax: glob cache/** 来源： https://stackoverflow.com/questions/4470029/how-to-ignore-the-same-directory-in-any-trees-with-mercurial

问题 How can I set label decorations for Mercurial managed projects? It's somehow set to changeset@project name. Previous version of the plugin used to show arrows and a number of changeset in local repository, which I liked a lot more. 回答1: I answered your other question here: eclipse mercurial plugin display arrow instead of changeset There is 1 configuration options under: Window->Preferences->Team->Mercurial->Performance. The 3rd checkbox 来源： https://stackoverflow.com/questions/22905782

问题 I am very new to version control, so my questions are very basic. I am trying to use Mercurial for the purpose. I have a local working directory on my mac. I want to use Bitbucket to backup the files and the repository in this directory. Will the following command: hg push localDirectoryWithRepo http://bitbucker.org/user_name/repo_on_bitbucket transfer my files also to Bitbucket, or only the repository? Also, I tried the command: hg clone localDirectoryWithRepo http://bitbucker.org/user_name

问题 I have a huge repository with many subfolders in the following layout: MainRepo ├── Folder1 ├── Folder2 ├── Folder3 ├── Folder4 └── Folder5 I'm trying to create another repo from folders Folder1, Folder2 and Folder3 . To do that I created the filemap to use in convert like this: include Folder1 include Folder2 include Folder3 rename . But when I try to convert the repository using: hg convert --filemap filemap MainRepo/ NewRepo I get the following error: ... <rev> message 1136 Merge with