dvcs

问题 I have a Hg repository with changeset 0 representing just "adding .hgignore". Starting with changeset 1 I added changesets step by step from a number of Subversion revisions by a script. Then I worked for some time with Hg. Now I decided that some more Svn revisions will be needed, which are located earlier in history than the beginning revision (changeset 1 in Hg). Is it possible to insert new changesets between 0 and 1? If yes: How? 回答1: You can use a Mercurial to Mercurial conversion for

问题 Here goes: $ cat .gitmodules [submodule "utils/external/firepython"] path = utils/external/firepython url = git://github.com/darwin/firepython.git [submodule "utils/external/textile"] path = utils/external/textile url = git://github.com/jsamsa/python-textile.git While this was still a Git repo, I needed to run git submodule init , after which some magic happens. Since I've now converted the repo to Mercurial (using hgext.git extension), I don't know what to do. Is there an equivalent process

问题 We want to use Git to deploy code on our webserver. Therefore, we have a initialized a bare repository on our production server. Whenever we release a new version, we perform a git checkout into the DocumentRoot of the website: git --work-tree=/path/to/webroot/ checkout -f master In the subdirectories of webroot , there are several files which are not tracked by Git (Cache files, user-uploaded files etc.). These must of course not be deleted by Git when performing the checkout (and this part

问题 I have a following scenario: 3 branches: - Master - MyBranch branched off Master for the purpose of developing a new feature of the system - MyBranchLocal branched off MyBranch as my local copy of the branch MyBranch is being rebased against and pushed to by other developers (who are working on the same feature as I am). As the owner of the MyBranch branch I want to keep it in sync with Master by rebasing. I also need to merge the changes I make to MyBranchLocal with MyBranch. What is a good

问题 I have two repository urls, and I want to synchronise them such that they both contain the same thing. In Mercurial, what I'm trying to do would be: hg pull {repo1} hg pull {repo2} hg push -f {repo1} hg push -f {repo2} This will result in two heads in both repos (I know it's not common to have two heads, but I'm doing this for synchornisation and it needs to be non-interactive. The heads will be merged manually from one of the repos and then the sync run again). I'd like to do the same thing

问题 I've been wondering what is the better DVCS for .NET developers? From reading various information it has sounded like Mercurial works better on Windows, but other information claims that Git has caught up and surpassed Mercurial in offering quality Windows and Visual Studio tools. Does anyone have good recent information or experience with trying both in a .NET development environment? 回答1: I have been using Mercurial for over a year now for doing .NET development, and it has been working out

问题 I've been wondering what is the better DVCS for .NET developers? From reading various information it has sounded like Mercurial works better on Windows, but other information claims that Git has caught up and surpassed Mercurial in offering quality Windows and Visual Studio tools. Does anyone have good recent information or experience with trying both in a .NET development environment? 回答1: I have been using Mercurial for over a year now for doing .NET development, and it has been working out

问题 I'm searching for compelling Git and Mercurial clients on Mac OS X. The most clients I've found so far were less compelling as I expected. Some of the clients are programmed even in Ruby or Tcl/Tk, which IMO aren't good OS X citizens in regard of integration in the OS. I have clients similar to Versions.app or Cornetstone in mind, which are Subversion-only clients. Perhaps somebody got an insider tip for me. 回答1: I just thought I'd mention that SourceTree is a Mac OS X client for both

问题 My colleague recently ask me to help him with precommit hook which block push to central repo. This is famous https://hg.python.org/hooks/file/tip/checkheads.py Algorithm of checkheads.py gather heads in branch ignoring changes from another branches by piece: for x in xrange(p + 1, end): if repo[x].branch() != branch: continue History contains merges from default to prod and then back from prod to default . So checkheads.py didn't find that changesets merged at default (connected in graph)

问题 When I try to get into the interactive rebase mode as explained here, all I'm getting is noop which is weird but I cannot figure out why. I am inside a temp branch in my machine and when I try to view the difference between, I get this: Tugberk@TUGBERKPC /D/Dropbox/AppsPublic/gulp-aspnet-k (temp-a) $ git log --pretty=oneline temp-a..ajryan/dev f0ef4ee40fde4de5360515fd556de9c3ed40431c update readme with new optionsfcba1ae3306ae041a1d82647e4cf65a0c96fe2f7 do not loop for build,