mercurial

Mercurial and NTFS Alternate data stream

戏子无情 提交于 2019-12-10 13:08:05
问题 How does Mercurial handle Alternate Data Streams (in the NTFS file system)? If it can't handle that, is there a DCVS that does? EDIT: When I change version with update , what happens to the ADS ? Is it lost (erased)? Is it versioned too? Is it alltogether ignored? 回答1: Mercurial does not store alternate data stream. Additionally, they are likely to be overwritten on update. I don't think any of the open source VCS I know handle that kind of thing (even permissions are usually not handled). 来源

Mercurial merge awesomeness - what am I missing?

怎甘沉沦 提交于 2019-12-10 12:54:19
问题 I've been using Mercurial for a while, and there's one "fact" that is given many times. In fact, it hit me while watching a video made by Fogcreek yesterday, this video: Fog Creek Kiln: Unlock the power of DVCS for your company that there seems to be something that doesn't work for me here. At around 1:39 in that video and onwards it makes a point of saying that while other version control systems tracks revisions (ie. snapshots), DVCS' like Mercurial track changesets (ie. what happened

Adding changes from one Mercurial repository to another

泄露秘密 提交于 2019-12-10 12:52:28
问题 When changing the VCS for my project FakeItEasy from SVN to Mercurial on Google Code I was a bit too eager (I'm funny like that). What I did was just checking the latest version out of SVN and then commiting that checkout as the first revision of the new Mercurial repo. This obviously has the effect that all history is lost. Later when getting a bit better acustomed to Mercurial I realized that there is such a thing as a "convert extension" that allows you to convert a SVN repo into a

Check if a url is a mercurial repository (like git ls-remote)

扶醉桌前 提交于 2019-12-10 12:49:01
问题 How can I check whether a URL points to a mercurial repository? With git, I would use git ls-remote $url and check the return value. Is there something similar for hg? 回答1: You can use hg identify for this: it can be run against a remote repository and Mercurial will abort with an exit code of 255 if the path given isn't a repository. This repository exists: $ hg identify https://bitbucket.org/mg/mercurial-talk; echo $? 7788b512c5bd 0 This one doesn't: $ hg identify https://bitbucket.org/mg

How to convert N local topmost commits to an MQ patch?

冷暖自知 提交于 2019-12-10 12:39:53
问题 I would like to arrange my last commits as an MQ patch. All the commits are local (never pushed to the server), but not all the local commits are to be converted. Say, I did 10 commits (never pushed) and now I wish to convert the last 5 to a patch. How do I do it? 回答1: Short version: $ hg qimport -r "-5:" Long version: $ hg qimport -r "last(all(), 5)" 回答2: You can import changesets via hg qimport if you've already got an MQ repository initialised (via hg qinit . The command only accepts one

Mercurial: Merge in accidentally created subfolder

十年热恋 提交于 2019-12-10 11:36:46
问题 TLDR: I seem to have created a separate repository in a subfolder of my main project. How can I combine them? I have a project folder, let's call it BOB . I cloned ( hg clone ) BOB to a new folder called BOB2 . To add new features, I created a subfolder on BOB2 called BOB-newfeatures . I have been working on this BOB-newfeatures folder for a while, with many checkins. Today I realized that somehow I created a separate repository for BOB-newfeatures (I hadn't changed anything on BOB2 main

Hgignore everything except, regardless of directory

ⅰ亾dé卋堺 提交于 2019-12-10 11:28:05
问题 I've seen the posts for hgignore everything except, but I can't seem to transform the regex to work with subdirectories as well. syntax: regexp (?<!\.cfm)$ Works for the root directory but not subdirs/subsubdirs. I don't want to manually specify those. This is what I see without the ignore: >hg stat ? document.cfm ? document.txt ? subdir1\document.cfm ? subdir1\document.txt ? subdir1\subsubdir1\document.cfm ? subdir1\subsubdir1\document.txt ? subdir2\document.cfm ? subdir2\document.txt This

Why is mercurial dumb when merging? How can I make pulling/merging changes simpler?

ぐ巨炮叔叔 提交于 2019-12-10 11:11:38
问题 I just started to use Mercurial and I think I'm trying to do something very simple, something that should be quite typical, but I'm stumped on why it's so complicated, and why it doesn't just work the way it should (IMO). I share some a repository with a friend, he makes some changes and checks in several files and pushes them. Now in svn I'm used to just updating my working copy and getting his changes, no hassle. But with mercurial apparently I have to merge. What I don't get is: shouldn't

HTTP Error 502: Bad Gateway when pushing to bitbucket

帅比萌擦擦* 提交于 2019-12-10 11:04:31
问题 I have a mercurial repository, when I try to push my changes to bitbucket I suddenly get the error HTTP Error 502: Bad Gateway after a long moment of wait (searching changes..) Any idea? this has had me stumped for two days! 回答1: Some people report similar issues when trying to push big changesets using the HTTP protocol. Try using SSH instead. You can find instructions for Bitbucket here. 来源: https://stackoverflow.com/questions/11847857/http-error-502-bad-gateway-when-pushing-to-bitbucket

Compare Mercurial Repos

浪尽此生 提交于 2019-12-10 10:37:39
问题 I have a bunch of Mercurial repositories on my Windows workstation. We're a small shop, and on some days (usually bad ones) I may make changes / bug fixes in half a dozen or more of my projects. Some of these projects are in maintenance mode, they're only touched once a month or so. Of course, I sometimes get interrupted before I get to push to our central Hg server. Is there an easy way to regularly compare a bunch of my repos with the central server? It should warn me if I have changes that