mercurial

问题 So right now I'm learning Ruby on Rails, and I'm working through the book "Agile Web Development with Rails". I've also decided that I want to give Mercurial a go, because I've read up on distributed SCM's, and it seems like an ideal situation. I still, however, prefer to push my code remotely to my Linux VPS just incase my hard drive decides to take a dive. So, my question is specific to branching in Mercurial. Right now I've got a remote repository set up and I can push changes over SSH

问题 I run hg pull which added new changes to my repository. Before updating my working directory with the new changes i would like to see these new files/changes. I believe in SVN i used svn st -u but how is it done in Mercurial? 回答1: (After pulling the changes via hg pull ) you can run hg status --rev tip to show an output similar to svn st -u . 回答2: Before you even pull you can use: hg incoming --stat to see a summary of changes or hg incoming --patch to see the actual deltas. After pulling

问题 Hoi, I try to hg pull from my private repo on Bitbucket.org into my local repo on my Windows machine from behind the company proxy that requires Windows authentication. I found the proxy server and port (Internet options of IE) I found the settings Mercurial.ini file in my %USERPROFILE% I added this section to it (info): [http_proxy] host = TheProxyServer : TheProxyServerPort user = MyWindowsLogin passwd = MyWindowsPassword This works: C:\path\to\repo> hg pull http authorization required

问题 Mercurial supports push-style cloning of repositories to remote hosts, however newly cloned repositories don't contain working copies. Is there any 'hidden' option to make mercurial call update upon these cloned repos? Here is an example: 1) hg init hello 2) hg clone hello ssh://somehost/hello ssh://somehost/hello only contains .hg directory and I have to execute the following command in the shell in order to fill the working copy: 3) ssh somehost 'cd hello && hg update' Is there any way to

问题 Suppose I have a project in source control with a lot of subdirectories, many of which I don't need at the moment. I would like to create a working copy containing only some of the entire tree, which still maintaining the ability to make changes, commit them, and push them back up. Is this possible and if so, how can I do it? I'm still deciding whether to go with bazaar or mercurial, so answers regarding either of those would be helpful. Edit: Actually, solutions for git would be useful too.

问题 At work, we're using ClearCase right now. However, there's a lot of overhead required, especially when someone does something stupid (like erase a view with multiple reserved check-outs on the trunk...). Since we're trying to lower our overhead and be as lightweight as possible, we've through about the possibility of ditching CC and going for something lighter (Subversion or Mercurial), seeing as how we don't use 90% of CC's features anyway. Does this sound reasonable or will we be trading

问题 I've been dabbling with Mercurial for a short while now, and I've now set up several projects on BitBucket, one forking off of the other. I've been able to make changes to each repo with no problem, but one thing I can't figure out, is how to keep the fork up-to-date with changes from the parent repo? After I've forked a repo, I only see the commits from that repo up to X revision, after which point I only see the fork's own commits, no new parent commits. I'm pretty certain that during my

问题 Hi I hope you can from my i/o tell how to proceed to merge everything to the latest update without losing my changes: $ hg merge avbryter: grenen 'default' har 4 huvuden - sammanfoga med en specifik rev (kör 'hg heads .' för att se huvuden) ubuntu@ubuntu:/media/Lexar/montao$ hg heads ändring: 192:e571b17295e9 märke: tip förälder: 175:f50d4c4461e5 användare: tekniklas datum: Sat Jan 08 04:45:07 2011 +0000 kortfattat: twitter support added ändring: 191:9e419ce3e7e1 användare: tekniklas datum:

问题 Emacs VC mode show changes in directory state but ignore MQ changes... I want to remove patch from queue and apply it on working directory. This is possible with usual patch command, but it require passing some arguments and paths to utilities (which is inconvenient as not all environment allow autocompletion). I expect hg built-in solution. Ideally - to move patch to shelve. 回答1: Moving changes from MQ to working tree and forgetting it: $ hg qgoto my.patch $ hg qpop $ hg qdel --keep my.patch

问题 We have 2 mercurial named branches, development and test. There have been many changes to development that were supposed to be merged up into test. At one point the changes were merged up and then rolled back. Then the merge may have been attempted in the wrong direction. The result is that we now have 2 branches with a recent common parent. And we still have changes in development that are not in test. But due to the mistakes we made and the common parent, merging development to test does