mercurial

问题 I commited (not pushed) a lot of files locally (including binary files removing & adding...) and now when I try to push it takes a lot of time. Actually I messed up my local repo history. How could I avoid this mistake in the future ? Can I transform a set of local revision 1->2->3->4 to 1->2 with 2 being the final revision of the local clone ? edit: since I was in hurry I started a new remote repo from scratch with revision 4. In the future I will go with the marked answer as it seems easier

问题 I have two named branches, SPRINT_009 and SPRINT_010. Some changesets have been committed to SPRINT_009 that I would like to merge into SPRINT_010. I was able to merge the changesets from branch_one back into default without any trouble. I am having problems merging the changesets from branch_one into branch_two. default A -- B -- C -- G -- H -- I -- J -- K -- L -- N -- O -- P \ \ / SPRINT_009 D -- E -- F ----------------- ---------- ---------- \ SPRINT_010 M Here are the commands I am using:

问题 In my repo, I have the revisions 1 to 10. I've pushed up to 5 (so the next hg push would publish revisions 6-10). But I have to interrupt my work now and the result isn't 100% complete. So I'd like to move the revisions 6-10 into a new "experimental" branch to allow someone else to complete the work without disrupting the sources for everyone. How can I add a branch to a non-tip revision (in my case: Starting with revision 6)? Or should I use a completely different approach? 回答1: You cannot

问题 I'm trying to clone a bit repository from bitbucket via hg but I keep getting this error: abort: stream ended unexpectedly (got 404093 bytes, expected 8706452) mac:~ user$ hg clone https://user2@bitbucket.org/mine/test http authorization required realm: Bitbucket.org HTTP user: user2 password: destination directory: test requesting all changes adding changesets adding manifests adding file changes transaction abort! rollback completed abort: stream ended unexpectedly (got 404093 bytes,

问题 I am trying to configure mercurial with teamcity but getting the following error: stderr: abort: error: _ssl.c:504: error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed tried solutions mentioned in following link of signed certificates but nothing seems to be working. https://www.mercurial-scm.org/wiki/CACertificates#Manually_bypassing_security_checks_on_self-signed_certificates Any Idea what I am missing here. Please guide 回答1: Fix the problem by putting the

问题 I am a frontend designer and don't have a large programming background. I do CSS/html and a bit of JavaScript. The tech team at our company has moved our version control from Git (github) to Mercurial (Kiln). The only reason for them is to get the code review feature of Kiln (we use Fogbugz and love it). The problem is that the frontenders and non-developers working in our version control are funcking up all the time. We use hg-git to deploy on Heroku and are used to git (never worked with

问题 Few days ago I started experimenting with Mercurial, and everything went great, until I decided to try writting a small program, that gets the list of repositories and lists of changeset IDs for each repository from a remote server, allows the user to pick repository and changeset, clones it and updates to the chosen revision. This led to two questions: Is there a way to get a list of repositories from server (besides parsing HTML)? Is there a way to get information, such as tags, branches,

问题 I'd like to remove a directory and all the files in it from a repo. I have removed all the files with 'hg remove', but how do I remove the directory itself? Will it just automatically vanish once I commit all the removed files? thanks! 回答1: Yes. Because mercurial doesn't track directories at all, only files, it only creates directories that have files in them, and if someone hg updates to a revision any directories that become empty are automatically removed. So if you do: hg remove directory

问题 I'd like to remove a directory and all the files in it from a repo. I have removed all the files with 'hg remove', but how do I remove the directory itself? Will it just automatically vanish once I commit all the removed files? thanks! 回答1: Yes. Because mercurial doesn't track directories at all, only files, it only creates directories that have files in them, and if someone hg updates to a revision any directories that become empty are automatically removed. So if you do: hg remove directory

问题 An interesting feature in mercurial is the ability to view the changes that will be committed in a vim split (see DiffsInCommitMessageInVIM). Any hint on how to do so with git ? 回答1: Assuming you've got syntax enabled, Vim detects git commit messages as a filetype. This should be obvious from highlighting. The much less obvious part is that it also has a filetype plugin for git commits (and other git things). Make sure you have those enabled ( filetype plugin on ), and then there will be a