mercurial

问题 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 have a client that hired me to implement version control using Mercurial, for his fifteen year old application. But also wants to have the whole history loaded to Mercurial server, but there is no version control software currently, only renamed files with the date they were changed, like program1.c to program1_20060917.c and program1 copy (1).c, and old folders with all the files (another version), like folder_20080419. I thought of importing file by file as a change, but the count goes

问题 I have well working Mercurial. I can push/pull through cmd commands. But in NetBeans push/pull lasts forever. I've tried to push to BitBucket over http and it worked. But the same thing over ssh didn't. And the same ssh push with 'hg push ssh://...' worked. What's wrong with NetBeans? It may be some option i should change or smth. 回答1: Ok, i've managed the issue. I needed to upload my public key in bitbucket's profile. And put public key in authorized_keys file at my server. After that

问题 I am maintaining a git fork of an hg repository with some additional patches. What this means is that I have cloned the hg repository and then pushed that repository to a git repository following these directions. I then cloned the git repository, applied some commits and then pushed those commits to the git repository. My history look like: hg-head\ /git-head A-B-C-F'-G' where F' and G' are my patches. The hg developer now pushes some patches to the hg repos and I want to incorporate those

问题 I'm in a small team of developers and designers, developing web applications and now we decided to start using version control. We have main development server where all projects are stored and we work on them through ftp(but we have ssh access). The questions is, what is the best way to update files on a server after someone pushed a commit on it, so all the changes could be instantly seen in a browser? As far as I know a git repository should be 'bare' to be able receive push's, and since

问题 I version controlled a project settings folder a couple months back on my default branch, and then over time created many branches off default. Now I've decided that I'd rather not have the project settings folder version controlled as it creates a lot of problems when switching between branches. So I've hg forget 'd this project settings folder which lets me keep the files on my local machine but removes them mercurial. However, when switching from one of the old branches which still have

问题 I want to allow pushing to the default branch only for certain users. Since Kallithea does not have this functionality built in my attempt was creating a hook that should provide that behavior. I know that Kallithea has a GUI for this but I wanted to use built in mercurial functionality and hgrc file in the repository. I have a hook defined in .hg/hgrc file in a repository that is served through Kallithea SCM [extensions] acl = [hooks] pretxnchangegroup.acl = python:hgext.acl.hook [acl]

问题 I'm a newbie in using mercurial and control version system in general, I know that: There exists a Central Remote repository Everybody has a local repository, obtained by cloning the central one creating a branch Everyone makes changes to a working space area, these changes are then committed to the local repository. After changes have been performed locally, they are merged with the centralized repository or the centralized repository is overwritten by means of a rebasing In mercurial when

问题 My repo is currently as follows: O 7: default | O 6: default | | O 5: default | | | O 4: default | | | O 3: default | / O 2: default | O 1: default I would like to move 6 and 7 to a new branch, how can I do it? 回答1: You can use the rebase extension for this. It needs to be enabled but that link has the information on how to do it. The commands would be: hg update 2 hg branch newbranch hg commit -m "Creating new branch" hg rebase -s 6 -d 8 This creates the new branch, commits it (which would

问题 I've looked at a handful of the other Hg hgignore file questions, but I haven't been able to get my regex to work. Imagine these files: Projects/search.intrasearch/newUI/override/xslt/foo.xsl Projects/search.intrasearch/newUI/default/ Projects/search.intrasearch/oldUI/baz/ I want to ignore the second two lines, but not the first. So, in Mercurial, I want to include files in the newUI/override directory and it's children, but that's it. In the real system, there are a bunch more directories