Starting with X stable / a—b—c—d—e—f—g development You can use the following steps to copy the last commit from your development branch to your stable branch: git checkout development@{0} # get working tree from “development”, detach HEAD git reset –soft stable # reposition detached HEAD on “stable” git commit # enter the appropriate commit message … Read more
To understand why Git does not offer some kind of what you are referring to as an “inheritance mechanism” (not involving a commit), you must first understand one of the core concepts of those SCMs (Git vs. ClearCase for instance) ClearCase uses a linear version storage: each version of an element (file or directory) is … Read more
Any of the following will work: Just transfer ownership of the repo to another user and have them add you as a collaborator. If someone forks your repo, then you delete the original, their fork is still there, unless it’s a private repository. they can then add you as a collaborator on their fork repo. … Read more
As I was struggling with it for a while, even with the description, and I think this is relevant for others too, I thought I’d post an implementation of how what J16 SDiZ described could be implemented. So, my take on the server-side update hook preventing too big files to be pushed: #!/bin/bash # Script … Read more
The only way I found to convert a Mercurial repo to Git, while keeping all the branches, was to use GitHub’s importer. This was also the easiest since it’s all done online. Nothing local to install, no command line stuff. Main idea Use Github’s importer to convert Bitbucket Mercurial repo to GitHub Git repo. Then … Read more
For me the following worked as well p4 revert //… : Revert every file you have open, in every one of your pending changelists, to its pre-opened state. or p4 revert -c default //… : Revert every file open in the default changelist to its pre-opened state Taken from : p4 revert documentation
It depends on the version of Mercurial that you’re using. The command used to be hg push -f … or hg push –force … to force the creation of a new branch in the remote repository (which is usually OK). However, using -f also allows you to create new heads in the remote repository (usually … Read more
Subversion is great — you can run the server yourself or use something like assembla.com to host your code (although that exposes it to the network). There are numerous gui applications like tortoise svn that would allow you to interact w/ the source control repo
Take a look at part about version control for single developer in my answer to “Difference between GIT and CVS” question here on StackOverflow. Some of those issues do still apply also to Subversion versus Git (or other distributed VCS: Mercurial, Bazaar, or less known: Monotone, Darcs), even if Subversion is improvement over CVS. DISCLAIMER: … Read more
On the one hand, SVN integration (with IDE, frameworks, wikis, …) is very mature, as well as its GUIs and code browsers (even though DVCS like Git and Mercurial progress every day). On the other hand, introducing a DVCS in an Enterprise environment is still not a trivial task: Some requirements are not easily met … Read more