mercurial

Different version of file in Mercurial repo

不想你离开。 提交于 2019-12-24 03:08:00
问题 I have 2 servers with same cloned Mercurial repo but with different config lines in some files in this repo. How can I control this files via Mercurial but haven't problem when pull/puss between servers? 回答1: You should rather have under version control: one config file template two config file values (one per environment) one script able to take the config file template and fill it with the right values depending on the environment. That way, no problem during pull/push. 来源: https:/

HTTPS for Mercurial 1.9.2 on windows server 2008/IIS 7 giving me Errno 10054

拥有回忆 提交于 2019-12-24 02:05:06
问题 We are a small company (its a Microsoft shop) we are currently using subversion with VisualSVN installed (pretty easy to setup btw) I am currently evaluating Mercurial because of branching nightmare in svn. So first i followed http://www.firegarden.com/software/hosting-mercurial-repo-iis7-windows-server-2008r2-x64-python-isapi-cgi with latest mercurial source code 1.9.2 and python 2.7 got the below error Failed to import callback module 'hgwebdir_wsgi' The specified module could not be found.

Mercurial - use hg log to view all ancestors

女生的网名这么多〃 提交于 2019-12-24 01:55:08
问题 Given changesets a --b ----c ------d --------e How can I get a listing of all changesets that come before d. Ie: how can you use hg log to return a-b-c? 回答1: You can do hg log -r :d (but it will also display d). 回答2: Use: hg log -r "ancestors(d)" This requires the revsets feature in Mercurial 1.7 and later. See hg help revsets for some great fun. 回答3: hg log -r d::a or hg log -r a::d This will require a reasonably recent (I believe 1.6 or later) version of Mercurial to work. 来源: https:/

Mercurial - use hg log to view all ancestors

我们两清 提交于 2019-12-24 01:55:04
问题 Given changesets a --b ----c ------d --------e How can I get a listing of all changesets that come before d. Ie: how can you use hg log to return a-b-c? 回答1: You can do hg log -r :d (but it will also display d). 回答2: Use: hg log -r "ancestors(d)" This requires the revsets feature in Mercurial 1.7 and later. See hg help revsets for some great fun. 回答3: hg log -r d::a or hg log -r a::d This will require a reasonably recent (I believe 1.6 or later) version of Mercurial to work. 来源: https:/

Git: how to update the working directory like hg up -C in Mercurial

混江龙づ霸主 提交于 2019-12-24 01:23:52
问题 I previously worked with the mercurial, but now with git. there were some problems, because git still a little different. Could you suggest how you can update the git repository to the last commit, discarding all changes and conflicts, as it does for example hg up -C in Mercurial I was advised to command git checkout -f , it displays this message: Your branch and 'origin/master' have diverged, and have 24 and 5 different commit(s) each, respectively. After applying this command, the files in

How can clone the mercurial repo with all history

元气小坏坏 提交于 2019-12-24 00:53:29
问题 I have the server with mercurial . Now i have the home computer where i am pushing all my repo to bitbucket account. My Work serve r has all the revisions like 900 on them. Now i want to clone that repo with all those 900 revisions and then push them to bitbucket so that i can see all those 900 revisions in my bitbucket account. Is this possible 回答1: In short, yes. Mercurial is a distributed version control system, which means (amongst other things) that every clone contains by default the

Mantaining a CMS and websites with Mercurial

南楼画角 提交于 2019-12-24 00:37:18
问题 I'm pretty new to mercurial and after reading a few tutorials I'm still doubtful on what's the best way to do what I intend to do with it. My goal would be to mantain a CMS that I'm developing (adding new features, fixing bugs, etc.) and being able to easily distributes those updates to websites I make with said CMS. I started by making a repository for the CMS itself, then when I want to make a new website clone the CMS repository and work on it. Now the questions: working on a website there

Mercurial from Subversion: moves, renames and tags

强颜欢笑 提交于 2019-12-24 00:32:52
问题 I have a subversion repo with the following layout: svnrepo/projectA/trunk svnrepo/projectA/tags svnrepo/projectA/branches svnrepo/projectB/trunk svnrepo/projectB/tags svnrepo/projectB/branches which I would like to move to a mercurial repo with a revised layout: hgrepo/projectA hgrepo/projectB What is the best way of doing this? Some of my thoughts are: Option1 Rearrange the paths in subversion (using svn move) to an intermediate format: svnrepo/trunk/projectA svnrepo/trunk/projectB svnrepo

Mercurial compared to private branches in SVN

∥☆過路亽.° 提交于 2019-12-23 20:26:28
问题 Assume for a minute that the branch/merge support in SVN is as good as in Mercurial. Consider on the one hand a SVN system where people always work in their own private branches, and then when they are at a suitable point, merge their private branch into the "main" (or whatever their "parent" branch happens to be). Periodically they can merge the other way to get their private branch up to date. Then on the other hand consider the Mercurial set up of having a central repository and each

Make a mercurial archive without prefix

浪子不回头ぞ 提交于 2019-12-23 20:16:53
问题 Maybe a a silly question, but my googles don't work. Doing the following on my repository root: $ hg archive my_archive.tar.gz Gives me a tar.gz file with an inner directory named my_archive , then inside my repo contents. I understand this is meant by hg arhives 's help: Each member added to an archive file has a directory prefix prepended. Use -p/--prefix to specify a format string for the prefix. The default is the basename of the archive, with suffixes removed. But it boggles my