Context-aware merge?
Semantic Merge. Languages supported, from the website: We started with C# and Vb.net, then added Java. Now C is already supported and then we’ll focus on C++, Objective-C and JavaScript, depending on your feedback
cvs
Is there a migration tool from CVS to Git?
The only tool that has incremental import seems to be git-cvsimport. If you want to convert (migrate) from CVS to Git, the best solution for now seems to be mentioned above cvs2git mode of cvs2svn. See also Interfaces Frontends And Tools page on Git wiki, section about interaction with other revision control systems.
How do you deal with configuration files in source control?
What I’ve done in the past is to have a default config file which is checked in to source control. Then, each developer has their own override config file which is excluded from source control. The app first loads the default, and then if the override file is present, loads that and uses any settings … Read more
Why should I use version control? [closed]
Have you ever: Made a change to code, realised it was a mistake and wanted to revert back? Lost code or had a backup that was too old? Had to maintain multiple versions of a product? Wanted to see the difference between two (or more) versions of your code? Wanted to prove that a particular … Read more
Transferring legacy code base from cvs to distributed repository (e.g. git or mercurial). Suggestions needed for initial repository design [closed]
Just a quick comment to remind you that: those migrations often offer the opportunity to reorganize the sources, not along modules (each with one repositories) but rather along a functional domain split (several modules for a same given functional domain being put in the same repository). Then submodules are to be used, as a way … Read more
Moving from CVS to Git: $Id$ equivalent?
The SHA is just one representation of a version (albeit canonical). The git describe command offers others and does so quite well. For example, when I run git describe in my master branch of my Java memcached client source, I get this: 2.2-16-gc0cd61a That says two important things: There have been exactly 16 commits in … Read more
How to export revision history from mercurial or git to cvs?
Fortunately for those of us who are still forced to use CVS, git provides pretty good tools to do exactly what you’re wanting to do. My suggestions (and what we do here at $work): Creating the Initial Clone Use git cvsimport to clone the CVS revision history into a git repository. I use the following … Read more
Sell me distributed revision control
I’m a Mercurial developer and have worked as a Mercurial consultant. So I find your questions very interesting and hope I answer them: What is the advantage or value of committing locally? […] You are correct that IDEs can track local changes beyond simple undo/redo these days. However, there is still a gap in functionality … Read more