Documentation says: "Because git-cherry compares the changeset rather than the commit id (sha1), you can use git-cherry to find out if a commit you made locally has been applied under a different commit id." Let's see: $ git cherry master release-1.1.0 | head -1 - 533e2559342910fbffa2be5b38fdd7f2ddb2ed53 $ git show 533e2559342910fbff...
When using git submodules, what is the preferred way of doing customizations? Should I... fork the project and track the fork attempt to override the default behavior make the changes locally If none of these makes sense, then what does? ...
I've been using Mercurial for some development lately and have been loving it. I'm curious, is Microsoft using any form of distributed source control internally, and/or are they moving toward it in any way? I found this article: http://maratux.blogspot.com/2009/03/microsoft-uses-git-for-version-control.html It says that Microsoft is u...
During merges mercurial leaves .orig file for any unresolved file. But after manually resolving problems and marking a file correct it does not delete the .orig file. Can it be automatically removed by some command? I work on a Mac so I can use something like: find . -iname '*.orig' -exec rm '{}' ';' and alias it or something, but I'...
In svn you can link a repository to any folder in another svn repository. I'm wondering if there is a similar feature for git? Basically I want a git submodule inside my repository, but I want the submodule to be a pointer to a subfolder of another git repository, not the whole repository. Is this possible? ...
I work in a ClearCase shop and CC does a good job of integrating the team's work though our code review process prevents me from using it to track my daily changes. Creating an hg repository on top of my CC view works really well. I can track my changes and easily make backups on the file server, produce diffs for people etc. This is a...
This is probably the simplest newbie question. I have a project in which I've run git init. After several commits, I do a git status which tells me everything is up to date and there are no local changes. Next, I make several consecutive changes and realize I want to throw everything away and get back to my original state. Will this c...
How do I do what svn switch does, in Mercurial? That is change my working directory to switch to another branch in the repository? ...
What are the advantages and disadvantages of distributed revision control systems? If you have any experience with distributed systems like Git, Mercurial, Plastic SCM, etc. please share your experience. Tell us what worked well and where problems arose. I'm particularly interested to hear about the use of distributed systems in tradit...
After almost two years of using DVCS, it seems that one inherent "flaw" is accidental data loss: I have lost code which isn't pushed, and I know other people who have as well. I can see a few reasons for this: off-site data duplication (ie, "commits have to go to a remote host") is not built in, the repository lives in the same director...
I have WebDAV access to a filesystem where I can't write to the root of the filesystem, but can write to 2 folders beneath it. I'd like to: track my changes in a single DVCS repo (git/hg preferred) work directly on the WebDAV connection rather than constantly pulling changes into it (this would hurt my workflow quite a bit) Assume th...
If I start out with a local mercurial repo, which I consider to be the "main" repo (pardon me my dvcs lords), and intend to use bitbucket as a backup and issue tracking facility, I can do all my changes in my local repo and do an "hg push" to send the changes back to bitbucket. Don't I need to follow this "hg push" command run on my loc...
Beginner Git question: In the Mercurial world, "hg tags" gives me a list of tags and the corresponding revisions, whereas "git tag" only lists the tag names. How do I see what the matching rev number/hash is? ...
This may be more appropriate as an issue in whatever issue tracker/forum Git uses, but I thought I'd get an SO confirmation/explanation first: I have a repo tracking a bunch of installer executables. Let's say foo-1.0.exe is already in the repo. I now add foo-2.0.exe in the same directory (git add foo-2.0.exe). Next, I remove foo-1.0...
I think the title says it all - I want to easily tell which files where renamed when looking at the changelog using the tortoisehg UI. The out-of-the-box config only shows that a file was added/removed (i.e. the standard hg log message without the -C option). ...
It sounds to me like subversion's centralized model works better for web application development where you have a team of engineers working currently on the same code base and releasing constantly. On the other hand Git's distributed model is appealing for an IPhone app because 1) I dont' need a connection to browse the repository 2) it...
My team's development processes are based on continuous integration. The only branches we create are maintenance branches when we release, but otherwise developers are expected to commit regularly (daily if not more often) to trunk, so that everyone's work is always integrated, continually tested, and all that good stuff. My understandi...
We are migrating from Clearcase to another VCS (probably either SVN or Mercurial). For companies that have made this transition, what factors did they find important in selecting another VCS tool, and what practices did they find eased the transition? ...
Is there any good way to handle large assets (i.e. 1000's of images, flash movies etc.) with a DVCS tool such as hg and git. As I see it, to clone repositories that are filled with 4 GB assets seems like an unnecessary overhead as you will be checking out the files. It seems rather cumbersome if you have source code mixed together with a...
There's a special place in hell for people who hardcode absolute paths and database credentials into multiple random places in web applications. Sadly, before they go to hell they're wreaking havoc on Earth. And we have to deal with their code. I have to perform a few small changes to one of such web applications. I create a new branch...