mercurial

问题 I've got a repository that has a lot of working code. Another developer on my team went without any updates for a while and then committed about 5 changesets. So, now we have two heads that are nearly two weeks apart. The tip doesn't work, but my changeset does. I want to see what the differences are between the two repositories without having to merge them (because I'm not sure I want to do that). 回答1: If you have both heads in your repository (remember, you don't actually have to update

问题 Mercurial tracks the contents of a file throughout renames ( hg mv $OLD $NEW ), so that hg annotate $NEW also shows up the line-wise changes formerly made to $OLD with their original identification. That works fine. BUT there seems no straightforward way to find out the name of the $OLD file, to which some given line has belonged within the ancestry of $NEW . hg annot $NEW -r$REV only works down to the rename changeset. Of course the information is somehow accessible, e. g. by crawling

问题 I am attempting to migrate from a mercurial repository to a git repository using fast-export, but I am getting Error: repository has at least one unnamed head: hg r491 回答1: I wrote a plugin for fast-export that allows you to specify the divergent commit for an unnamed head along with a new branch name, and that entire line will be moved to that new branch. /path/to/hg-fast-export.sh -r /path/to/hg_repo -f --plugin head2branch=aliases,373 --plugin head2branch=threads,374 Until this is

问题 From what I understand of subversion if you have a repo that contains multiple projects, then you can branch individual projects within that repo (see SVN Red book - Using Branches) However what I don't quite follow is what happens when you create a branch in one of the distributed systems (Git, Hg, Bazaar - I don't think it matters which one). Can you branch just a sub-directory of the repo, or when you create the branch are you branching the entire repo? This question is part of a larger

问题 I am reading up on subrepos, and have been running some tests locally, seems to work OK so far, but I have one question. How do I specify/control which changeset I want to use for a particular subrepo? For instance, let's say I have the following two projects: class library application o fourth commit o second commit, added a feature | | o third commit o initial commit | | o second commit |/ o initial commit Now, I want the class library as a subrepo of my application, but due to the

问题 How do you abandon all repository changes since the last commit in Mercurial? I don't think that this is the revert command, because that will actually update the working directory to the last commit. I just want to undo changes in the repository (added files, removed files, etc). But, I'm new with Mercurial, so I could be missing something. 回答1: You do want revert . The two commands revert and update are complimentary. They both update the files in your working directory, but update also

问题 Our team is just getting started with Mercurial. One of the first things we've started to play with is hg shelve . Locally, I have no problem shelving changes. It all works perfectly from what I can tell. However, when I try to unshelve, I get the restoring backup files message, but when I run hg diff , there are no changes, and my changes are missing from the code. If i do hg unshelve -i I can see the diff, but again, trying to unshelve seems to have no effect. I've been trying to test it

问题 How to delete a remote commit from bitbucket mercurial repository? Findings: I could not found "Repository management" in the "Admin" section. which is mentioned in this answer. Is this feature deprecated/dropped from bitbucket? If not where it is? Note that I am owner of the repository. Note for expert! only: Remember I have already pushed my commit to bitbucket. I know deleting commit is not good, I am not interested to a backout my history by adding an extra commit. Moreover I can ensure

问题 I'm looking for a solution very close to the usage with mercurial, as seen below. I have tried git add -p , git add -e , git add --interactive , tig and few others. I've also looked at this and this. However these methods prove to be cumbersome and annoying when I have to do this across multiple hunks over different files. Note that GUI is not an option. Edit-1: I've tried vim fugitive and can't select hunks like this in fugitive as well. Edit-2: Removed comparison with hg. 回答1: Andrew

问题 What are some examples of version control systems that work on files and on lines of files? In my understanding, a control system that works on file is able to automatically manage merges whenever there are no file conflicts: for example: A,B,C --> A',B',C | (branch) ___________ (merge) -> A',B',C' -------> A,B,C' In what cases a version control system that work on lines is able to manage merge by itself and in what other cases it asks the developer to solve them? 回答1: Your questions is too