tortoisehg

问题 Let's suppose it was performed merge with "Discard all changes from merge ..." option, bu accident. And this wrong commit has been committed into the "central" repository. How to deal with this case if I need to merge in correct way the branch changes? Commands to reproduce the case: hg init mr cd mr echo "123" > file.txt hg add hg ci -m "initial" hg branch br echo "234" >> file.txt hg ci -m "in branch" hg up default echo "567" >> file.txt hg ci -m "in default" After these commands open

问题 I have a site developed using Yii framework, and I want to upgrade the framework from version 1.1.8 to 1.1.11. I have made framework modifications that went into 1.1.11, but others didn't and I don't remember exactly which ones they are. Is there a way to search for all the changes in a Mercurial repository made in a certain path? The framework sits in ./yiiframework directory. 回答1: You can pass a path to the hg log command: hg log path/to/foo 回答2: While @David answer is technically correct,

问题 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

问题 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

问题 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

问题 Out of a huge source tree, i want just one subfolder be tracked by Mercurial. specific/component/subfolder In any decent regex tool (Regex Coach, regexpal.com), the following is absolutely sufficient (and understandable) ^(?!specific/component/subfolder).+ meanwhile .hgignore insists on having ^(?!extras).+ ^extras/(?!extensions).+ ^extras/extensions/(?!sharing).+ as soon as i put slash inside the lookahead group, nothing gets through. Before calling this a bug (perhaps of yet another

问题 I have a Mercuirial (3.6.1) project. Every time I try to commit I get the next error. (project)➜ project hg:(default) ✗ hg commit -m "TICK-190" subfolder/models.py ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.6 (default, Mar 22 2014, 22:59:56) [GCC 4.8.2] ** Mercurial Distributed SCM (version 3.6.1) ** Extensions loaded: Traceback (most recent call last): File "/home/django/project/bin/hg", line 43, in <module>

问题 This question already has an answer here : Closed 7 years ago . Possible Duplicate: How to deal with committer name change in Mercurial On a new install, I forgot to set my username reasonably in my hg client. As a result, the last few commits have me listed as " Billy ", rather than the " Billy O'Neal <billy.oneal@example.com> " like I have been using. Is there a way I can change these to make them consistent? 回答1: It is possible to edit history with extensions like mq and convert, but if

问题 I am trying to use patches (to revive a corrupted repository) for the first time in my life. So I am not very well familiar with the concept, though I've read a bit. I am using TortoiseHg. I have created a patch (as a file), switched to another repository, and am trying to import it. I've asked THg to import it to Repository (other options are Shelf and Working Directory). When I click Import, THg says that the patch was imported to a working directory and the Console reads: % hg import -

问题 I've got 2 Mercurial repositories RepoA and RepoB , 2 people have been working independenlty on each of their repos, RepoA only has one branch(Default) but 9 commits, RepoB has 2 branches, Default and Experiment1, each of these branches have approx 30 commits. Now it turns out that RepoB is a subset of RepoA, i.e alot of the stuff in RepoB can be put into RepoA. I'd like to Pull(import) all the contents of RepoB into a branch in RepoA. I do not want the import to go the Default branch of