dvcs | 易学教程

Using Mercurial in a Large Organization

阅读更多关于 Using Mercurial in a Large Organization

问题 I've been using Mercurial for my own personal projects for a while, and I love it. My employer is considering a switch from CVS to SVN, but I'm wondering whether I should push for Mercurial (or some other DVCS) instead. One wrinkle with Mercurial is that it seems to be designed around the idea of having a single repository per "project". In this organization, there are dozens of different executables, DLLs, and other components in the current CVS repository, hierarchically organized. There

Mercurial: Can I rename a branch?

阅读更多关于 Mercurial: Can I rename a branch?

问题 We now have a "stiging" branch, where "staging" seems to be a far better semantic fit. What's a good strategy for handling this? 回答1: Update to the stiging branch and create a new branch off of it. Then close the old branch. In summary: hg update stiging hg branch staging hg commit -m"Changing stiging branch to staging." hg update stiging hg commit --close-branch -m"This was a typo; use staging instead." hg push --new-branch 回答2: For future readers: With the rebase extension, you can make a

Backing Out a backwards merge on Mercurial

阅读更多关于 Backing Out a backwards merge on Mercurial

问题 How do you reverse the effect of a merge on polarised branches without dying of agony? This problem has been plaguing me for months and I have finally given up. You have 1 Repository, with 2 Named Branches. A and B. Changes that occur to A will inevitably occur on B. Changes that occur directly on B MUST NEVER occur on A. In such a configuration, merging "B" into "A" produces a dire problem in the repository, as all the changes to B appear in A as if they were made in A. The only "normal" way

Mercurial marks unmodified files as modified in working directory and fails to revert

阅读更多关于 Mercurial marks unmodified files as modified in working directory and fails to revert

问题 Our team uses TortoisHg 2.0.5 on Windows and after refreshing file list in working directory it sometimes (at least once a day :(( ) shows a list of unmodified files as modified. Manual comparison doesn't show any changes in code, line breaks are also equal. Reverting of these "fantom" files causes no result. There a two way how we deal with this problem: Turning off eol extension and reverting the files, Manually removing the files and update them from the head revision. It's really annoying

Locking binary files using git version control system

阅读更多关于 Locking binary files using git version control system

For one and a half years, I have been keeping my eyes on the git community in hopes of making the switch away from SVN. One particular issue holding me back is the inability to lock binary files. Throughout the past year I have yet to see developments on this issue. I understand that locking files goes against the fundamental principles of distributed source control, but I don't see how a web development company can take advantage of git to track source code and image file changes when there is the potential for binary file conflicts. To achieve the effects of locking, a "central" repository

how to ignore files in kiln/mercurial using tortoise hg “that are part of the repository”

阅读更多关于 how to ignore files in kiln/mercurial using tortoise hg “that are part of the repository”

We use tortoise hg with Kiln. In my vs 2010 c# project there are some files that are part of the repository but I would like tortoise hg to ignore them when I make a commit. For eg., say in a login screen I may hard code the userid, password for testing. I dont really want this file considered during a commit. I understand .hgignore file but this really works for files that are not part of the repo. Any trick in tortoise hg to ignore files that are part of the repo ? (so they do not show up as modified (M) during a commit.) thanks I always use a combination of .hgignore and BeforeBuild (in the

Named Branches vs Multiple Repositories

阅读更多关于 Named Branches vs Multiple Repositories

We're currently using subversion on a relatively large codebase. Each release gets its own branch, and fixes are performed against the trunk and migrated into release branches using svnmerge.py I believe the time has come to move on to better source control, and I've been toying with Mercurial for a while. There seems to be two schools of though on managing such a release structure using Mercurial. Either each release gets its own repo, and fixes are made against the release branch and pushed to the main branch (and any other newer release branches.) OR using named branches within a single

Mercurial — revert back to old version and continue from there

阅读更多关于 Mercurial — revert back to old version and continue from there

I'm using Mercurial locally for a project (it's the only repo there's no pushing/pulling to/from anywhere else). To date it's got a linear history. However, the current thing I'm working on I've now realized is a terrible approach and I want to go back to the version before I started it and implement it a different way. I'm a bit confused with the branch / revert / update -C commands in Mercurial. Basically I want to revert to version 38 (currently on 45) and have my next commits have 38 as a parent and carry on from there. I don't care if revisions 39-45 are lost for ever or end up in a dead

How to set up Git bare HTTP-available repository on IIS

阅读更多关于 How to set up Git bare HTTP-available repository on IIS

问题 My server already runs IIS on TCP ports 80 and 443. I want to make a centralized "push/pull" Git repository available to all my team members over the Internet. So I should use HTTP or HTTPS. But I cannot use Apache because of IIS already hooking up listening sockets on ports 80 and 443! Is there any way to publish a Git repository over IIS ? Does Git use WebDAV? Update. It seems that Git HTTP installation is read-only. That's sad. I intended to keep the stable branch on a build server and

How do I keep an svn:external up to date using git-svn?

阅读更多关于 How do I keep an svn:external up to date using git-svn?

问题 Treating my repository as a SVN repo, I get: svn co http://myrepo/foo/trunk foo ... foo/ bar/ baz/ -> http://myrepo/baz/trunk Treating it as a Git repo, I get: git svn clone http://myrepo/foo --trunk=trunk --branches=branches --tags=tags ... foo/ bar/ I can clone baz to my local machine elsewhere and add a symlink, but that's just a hack. Is there a way to have git svn rebase automatically pull in those changes when it updates everything else, just like svn up does? 回答1: The best means of