mercurial

hg shelve installed but hg: unknown command 'unshelve'

你。 提交于 2020-01-14 10:25:07
问题 I installed the shelve extension for hg by adding 'shelve=' to [extensions]. I can verify this by running 'hg help extensions' which has the following in the output: enabled extensions: extdiff command to allow external programs to compare revisions fetch pull, update and merge in one command shelve Manage shelves of pickled objects. I then type 'hg shelve' in a repo of mine, and I get: hg: unknown command 'shelve' Mercurial Distributed SCM ... I would expect the shelve extension to run...

multiple source code repositories

风流意气都作罢 提交于 2020-01-14 08:18:11
问题 I use Mercurial for version controlling my source code. But some people prefer other version control systems (like git, Bazaar, SVN, CVS). I would like to know, is it possible to store a repository under multiple systems at once, so people can use whichever repository they want? 回答1: GitHub developed the hg-git extension for Mercurial. This extension allows you to clone from git repositories using Mercurial, and then push back in. So if you didn't mind having a central git repository, then it

With Mercurial, how do you hg log a branch with cross-branch ancestors?

余生颓废 提交于 2020-01-13 18:25:11
问题 In Mercurial, I'm wanting to build a changelog of all commit messages for revisions my stable branch. Currently, I'm using: hg log -r <oldid>::<newid> where is the revision id of the changeset from the last time we pushed out code, and is stable 's tip. This works great for code changes that are only on the stable branch, but if I'm merging another branch (such as a new major version which had its own development branch), all those commit messages are omitted! Instead I only get the 1 commit

Ignore future changes to a file in Mercurial, but still track it [duplicate]

爱⌒轻易说出口 提交于 2020-01-13 10:42:50
问题 This question already has answers here : Closed 8 years ago . Possible Duplicate: Mercurial: How to ignore changes to a tracked file I have a file in a Mercurial repository that I want to have stand as an example configuration file, but while I'm developing it I want to make specific changes to it I don't want tracked, like a database password. I tried adding that file to .hgignore , but Mercurial still notices modifications. Can I have a file "tracked" in a Mercurial repository, yet ignore

Mercurial: List all unmerged branches

点点圈 提交于 2020-01-13 09:01:16
问题 How do I list all unmerged branches? That is, I want a list of all branches that are not closed, and their head is not merged into some other branch. 回答1: You can use the branches command hg branches --active Branches are considered active if their last commit has not been merged into another branch. Closed branches won't appear in the output at all. If you need to handle the list programmatically, and can use .NET, there is also a Mercurial .NET library that can make this easy. 回答2:

Ignore whitespace when doing a merge in mercurial

这一生的挚爱 提交于 2020-01-13 08:32:31
问题 We're hitting a problem when merging in Mercurial where whitespace changes are causing merge conflicts which mask any "real" conflicts we may have and makes merging a nightmare. We've recently conformed to a formatting style which changed the indentation of files in some branches and merging has become almost impossible since. As an example, try: hg init testrepo cd testrepo/ echo "This is text." > newfile.txt hg add newfile.txt hg commit -m "Created a file." hg branch newbranch echo "This is

mercurial for OS projects and svn for Enterprise projects?

女生的网名这么多〃 提交于 2020-01-13 02:45:10
问题 correct me if im wrong, but isn't distributed SCMs for OS projects while centralized SCMs are better for corporate/private projects? cause with eg. mercurial anyone gets an exact copy of the repository with FULL history features, while with centralized you only get the latest working copy. im more focused on private projects so i wonder if its better with centralized SCMs or doesnt it matter? 回答1: You can use a DVCS (like mercurial) in large corporation. The limits of a DVCS compared to a VCS

Is `qrefresh` considered harmful?

谁说胖子不能爱 提交于 2020-01-12 23:38:17
问题 The qrefresh command in the MQ extension don't make sense to me. I'll explain my assumption: If you don't know on which revision should a certain patch be applied, it have a very little value. You just can't theoretically know what does the rejects mean. And even if there are no rejects on a certain revision, you're not sure the whole revision would compile. Once you qrefresh a certain patch in your patch queue, you're actually losing the parent of the next patch in the queue. So that without

What's the relationship between the two MercurialEclipse plugin sites?

℡╲_俬逩灬. 提交于 2020-01-12 14:52:50
问题 What are the similarities and differences in functionality and project leadership between the two MercurialEclipse plugins that are currently (November 2012) available in the Eclipse Marketplace? Just to expand on the question a bit: I just want to use the working copy of a Mercurial project within Eclipse, but when I look for a Mercurial plugin I face this confusing choice. I suspect that for the moment it doesn't matter very much which I use. But of course I don't know that for certain. At

Hosting Mercurial on IIS7

独自空忆成欢 提交于 2020-01-12 07:06:22
问题 Note, this might perhaps be best suited on serverfault.com, but since it is about hosting a programmer source code repository, I am not entirely sure. I'm posting here first, trusting that it'll be migrated if necessary. I'm attempting to host clones of my Mercurial repositories on my own server (I have the main repo somewhere else), and I'm attempting to set up Mercurial under IIS. I followed the guide here , but I get an error message . Solved : See bottom of this question for details. The