Comparison of version-control software: Difference between revisions
Appearance
Content deleted Content added
Line 159: | Line 159: | ||
| {{nonfree}} Aggregated usage formula, from $999 to $100,000 USD |
| {{nonfree}} Aggregated usage formula, from $999 to $100,000 USD |
||
|- |
|- |
||
! {{rh}} | [[Monotone (software)|Monotone]][http:// |
! {{rh}} | [[Monotone (software)|Monotone]][http://monotone.ca/] |
||
| Nathaniel Smith, Graydon Hoare |
| Nathaniel Smith, Graydon Hoare |
||
| actively developed |
| actively developed |
Revision as of 01:12, 25 September 2009
This article may contain unverified or indiscriminate information in embedded lists. (September 2009) |
The following tables compare general and technical information for notable revision control and software configuration management (SCM) software. This article is not all-inclusive and may become out of date quickly.
General information
Software | Maintainer | Development status | Repository model | Concurrency model | License | Platforms supported | Cost |
---|---|---|---|---|---|---|---|
AccuRev [5] | AccuRev, Inc. | actively developed | Client-server | Merge or lock | Proprietary | Any Java Platform (Unix-like, Windows, Mac OS X) | Non-free $1495 (enterprise) for each license, free 5-user 30 day trial licenses available |
Bazaar[6] | Canonical Ltd. | actively developed | Distributed[1] | Merge | GNU GPL | Unix-like, Windows, Mac OS X | Free |
BitKeeper[7] | BitMover Inc. | actively developed | Distributed | Merge | Proprietary | Unix-like, Windows, Mac OS X | Non-free Quoted on an individual basis. |
ClearCase[8] | IBM Rational | actively developed | Client-server | Merge or lock[2] | Proprietary | Unix-like, Windows, AIX, HP UX, i5/OS, OS/390, z/OS, | Non-free $4600 per floating license (held for 30-minutes minimum per user) |
Code Co-op[9] | Reliable Software | actively developed | Distributed | Merge | Proprietary | Windows | Non-free $150 per seat |
Codendi[10] | Xerox | platform actively developed with CVS & Subversion | Client-server | Merge or Lock | GNU GPL | Linux Red Hat Enterprise 5.x | Free- Commercial support subscription available |
Codeville[11] | Ross Cohen | actively developed | Distributed | Merge | BSD | Unix-like, Windows, Mac OS X | Free |
CVS[12] | The CVS Team [13] | maintained but new features not added | Client-server | Merge | GNU GPL | Unix-like, Windows, Mac OS X | Free |
CVSNT[14] | March Hare Software[15] and community members. | maintained and new features under development | Client-server | Merge or Lock | GPL or proprietary | Unix-like, Windows, Mac OS X, i5/OS | Free or commercial |
darcs[16] | David Roundy | actively developed | Distributed | Merge | GNU GPL | Unix-like, Windows, Mac OS X | Free |
Git[17] | Junio Hamano | actively developed | Distributed | Merge | GNU GPL | POSIX, Windows, Mac OS X | Free |
GNU arch[18] | Andy Tai | maintained but new features not added | Distributed | Merge | GNU GPL | Unix-like, Windows, Mac OS X | Free |
IC Manage[19] | IC Manage Inc. | actively developed | Client-server | Merge or Lock | Proprietary | Unix-like, Windows, Mac OS X | Commercial |
LibreSource Synchronizer[20] | Artenum[21] | maintained and new features under development | Client-server | Merge | GNU GPL[3] | Unix-like, Windows, Mac OS X | Free |
Mercurial[22] | Matt Mackall | actively developed | Distributed | Merge | GNU GPL | Unix-like, Windows, Mac OS X | Free |
MKS[23] | John Heathrow and David Artisan | actively developed | Client-server | Lock | Proprietary | Unix-like, Windows | Non-free Aggregated usage formula, from $999 to $100,000 USD |
Monotone[24] | Nathaniel Smith, Graydon Hoare | actively developed | Distributed | Merge | GNU GPL | Unix-like, Windows, Mac OS X | Free |
Perforce[25] | Perforce Software Inc. | actively developed | Client-server | Merge or Lock | Proprietary | Unix-like, Windows, Mac OS X | Free for up to 2 users, and for OSS development; else $900 per seat, with volume discounts [26] |
PlasticSCM[27] | Codice Software[28] | actively developed | Client-server/Distributed | Merge | Proprietary | Unix-like, Windows, Mac OS X | Non-free $500 per seat, with volume discounts, free 5-user 30 day trial licenses available [29] |
StarTeam[30] | Borland (Micro Focus) | actively developed | Client-server | Merge or lock | Proprietary | Windows and Cross-platform via Java based client | Non-free $7500 per concurrent, $2500 per fixed user. |
Subversion (SVN)[31] | CollabNet, Inc.[32] | actively developed | Client-server[4] | Merge or lock[5] | Apache/BSD style | Unix-like, Windows, Mac OS X | Free (Commercial support/services available) |
SVK[33] | Best Practical[34] | maintenance through 2010, no new features[6] | Distributed | Merge | Artistic/GPL | Unix-like, Windows, Mac OS X | Free |
Team Foundation Server[35] | Microsoft | actively developed | Client-server | Lock or merge | Proprietary | Server: Windows Server 2003; Clients: Windows and Web included | Non-free Licensed through MSDN subscription or through direct buy for $2800 [36] |
Telelogic Synergy[37] | Telelogic (IBM) | actively developed | Client-server and Distributed | Merge or Lock | Proprietary | Linux, Windows, Unix-like | Non-free Contact Telelogic [38] |
Vault[39] | SourceGear LLC[40] | actively developed | Client-server | Lock or Merge | Proprietary | Unix-like, Linux, Windows | Non-free $300 per user |
Visual SourceSafe[41] | Microsoft | serious bug fixes only | Shared Folder | Lock or merge | Proprietary | Windows | Non-free ~$500 per license or single license included with each MSDN subscription. |
Software | Maintainer | Development status | Repository model | Concurrency model | License | Platforms supported | Cost |
Table Explanation
- Software: The name of the application that is described.
- Maintainer: The company or group that is currently taking responsibility for the software's maintenance or development
- Development Status: The current status of the software project
- Repository model: describes the relationship between various copies of the source code repository. In a client-server model, users access a master repository via a client; typically, their local machines hold only a working copy of a project tree. Changes in one working copy must be committed to the master repository before they are propagated to other users. In a distributed model, repositories act as peers, and users typically have a local repository with version history available, in addition to their working copies.
- Concurrency model: describes how changes to the working copy are managed to prevent simultaneous edits from causing nonsensical data in the repository. In a lock model, changes are disallowed until the user requests and receives an exclusive lock on the file from the master repository. In a merge model, users may freely edit files, but are informed of possible conflicts upon checking their changes into the repository, whereupon the version control system may merge changes on both sides, or let the user decide when conflicts arise. Note that distributed version control almost always implies a merge concurrency model.
- License: The license model under which the software is licensed. These can be both free and paid licenses
- Platforms Supported: The operating systems that the software application currently supports.
- Cost: The price of the software application
Technical information
Software | Programming language | History model | Revision IDs | Repository size | Network protocols | Source Code Size |
---|---|---|---|---|---|---|
AccuRev | C++, Java | Changeset | Namespace | O(revisions) | custom | |
AVS | Java | Changeset | Sequence | O(revisions) | HTTP, HTTPS | |
Bazaar | Python, Pyrex, C[7] | Snapshot | Pseudorandom | O(patch) | HTTP, SFTP, FTP, custom, custom over ssh, email bundles[8], WebDAV (with plugin) | 4.1 MB |
ClearCase | C, Java, Perl | Changeset | Namespace | O(patch) | HTTP, custom (CCFS), custom (MVFS filesystem driver) | |
Code Co-op | C++ | Changeset | User ID-Ordinal | O(patch) | e-mail (MAPI, SMTP/POP3, Gmail), LAN | |
CVS | C | Changeset | Namespace | O(patch) | pserver[42], ssh | 3.3 MB |
CVSNT | C++ | Changeset | Namespace | O(patch) | sspi, sserver, gserver, pserver, custom over ssh | |
darcs | Haskell | Patch | Namespace | O(patch) | HTTP, custom over ssh, email | 1.7 MB |
Git | C, shell scripts, Perl | Snapshot | SHA-1 hashes | O(patch) | custom, custom over ssh, rsync, HTTP, email, bundles | 1.8 MB |
GNU arch | C, shell scripts | Changeset | Namespace | O(patch) | WebDAV, HTTP | |
IC Manage | c++, c | Changeset | Namespace | O(patch) | custom | |
LibreSource Synchronizer | Java | Changeset | Timestamp of the repository | O(patch) | HTTP, File-System | |
Mercurial | Python, C | Changeset | Numbers,[9] SHA-1 hashes | O(patch)[10] | HTTP, custom over ssh, email bundles (with standard plugin) | 1.2 MB |
Monotone | C++ | Hybrid[11] | SHA-1 hashes | O(patch) | custom (netsync), custom over ssh, file system | 4.4 MB |
Perforce | c++, c | Changeset | Namespace | O(patch) | custom | |
Plastic SCM | C/C++, C#, Java | Changeset | Namespace | O(revision) | TCP IP / SSL | |
StarTeam | C, Java | Snapshot | MD5 hashes | O(revision) | custom, TCP/IP | |
Subversion | C | Changeset and Snapshot | Namespace | O(patch) | custom (svn), custom (svn) over ssh, HTTP and SSL (using WebDAV) | 5.2 MB |
SVK | Perl | Changeset | ? | ? | ? | |
Synergy | Java | Changeset (text), Snapshot(binary) | Namespace | O(patch) | HTTP, custom over ssh, custom | |
Team Foundation Server | C++ and C# | Changeset | Namespace | O(patch) | SOAP over HTTP or HTTPS | |
Vault | C# | Changeset | ? | O(patch) | HTTP, HTTPS | |
Visual SourceSafe | C | Snapshot | Namespace? | O(changes)? | None, but can access repository files through a "share" | |
Software | Programming language | History model | Revision IDs | Repository size | Network protocols | Source Code Size |
Table Explanation
- Software: The name of the application that is described.
- Programming Language: The coding language in which the application is being developed
- History model: describes the form in which changes are stored in the repository. For example, when a change is committed, a system could store a copy of the tree before and after the change (snapshot), or it might instead store a copy of the tree before the change and a changeset representing the changes.
- Revision IDs: are used internally to identify specific versions of files in the repository. Systems may use pseudorandom identifiers, content hashes of revisions, or filenames with sequential version numbers (namespace). With Integrated Difference, revisions are based on the Changesets themselves, which can describe changes to more than one file.
- Repository size: describes the growth-rate of the repository as changes are committed. O(patch) means that it grows as the size of the patches between revisions, while O(revisions) means that it grows as the size of each revision checked in. O(Changesets) means that the repository grows with each changeset added.
- Network protocols: lists the protocols used for synchronization of changes.
- Source Code Size: Gives the size of the source code in megabytes.
Features
Software | Atomic commits | File renames | Merge file renames | Symbolic links | Pre/post-event hooks | Signed revisions | Merge tracking | End of line conversions | Tags | International Support |
---|---|---|---|---|---|---|---|---|---|---|
AccuRev | Yes | Yes | Yes | Yes | Yes | Yes[citation needed] | Yes | Yes | — | Yes |
Bazaar | Yes | Yes | Yes | Yes | Yes | Partial[12] | Yes | Yes[13] | Yes | Yes |
ClearCase | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes[14] |
Code Co-op | Yes | Yes | Yes | No | limited support | No | No | No | Yes | Unknown |
CVS | No | No | No | No | limited support | No | No | Yes | Yes | Unknown |
CVSNT | Yes | Yes | Unknown | Yes | Yes | No | Yes | Yes | Yes | Yes[15] |
darcs | Yes | Yes | Yes | No | Yes | Yes | —[16] | Unknown | Yes | Unknown |
Git | Yes | Yes (implicit) | Yes [43] | Yes | Yes [44] | Yes [45] | Yes | Yes | Yes | Partial[17] |
GNU arch | Yes | Yes | Unknown | Yes | Yes [46] | Yes | Unknown | Unknown | Yes | Unknown |
IC Manage | Yes | Yes | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
LibreSource Synchronizer | Yes | Yes | Yes | No | limited support [18] | No | Yes [19] | No | Yes | Unknown |
Mercurial | Yes | Yes | Yes | Yes[20] | Yes | Yes | Yes | Yes | Yes | Yes [21] |
Monotone | Yes | Yes | Yes | No[22] | Yes [47] | Yes, mandatory | Yes | No | Yes | Unknown |
Perforce | Yes | Yes[23] | No | Yes | Yes | Yes | Yes [48] | Yes | Yes | Yes [49] |
Plastic SCM | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Unknown | Yes | Unknown |
StarTeam | Yes[24] | Yes | Unknown | Yes | No | No | Yes | Yes | Yes | Yes |
Subversion | Yes | Yes[25] | No | Yes | Yes | No | Yes[26]. | Yes | Partial[27] | Yes |
SVK | Yes | Yes | Yes | Yes | Yes[28] | Yes[29] | Yes | Yes | Yes | Yes |
Synergy | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
Team Foundation Server | Yes | Yes | Yes | Unknown | Yes | Unknown | Yes | Unknown | Yes | Yes |
Vault | Yes | Yes | Yes | No | Yes | No | No | Yes | Yes | Unknown |
Visual SourceSafe | No | No[30] | Unknown | Yes (using shares)[31] | Yes | No | No | Unknown | Yes | Yes |
Software | Atomic commits | File renames | Merge file renames | Symbolic links | Pre/post-event hooks | Signed revisions | Merge tracking | End of line conversions | Tags | International Support |
Table Explanation
- Software: The name of the application that is described.
- Atomic commits: refers to a guarantee that all changes made are merged, or that no change at all will be made.
- File renames: describes whether a system allows files to be renamed while retaining their version history.
- Merge file renames: describes whether a system can merge changes made to a file on one branch into the same file that has been renamed on another branch (or vice versa). If the same file has been renamed on both branches then there is a rename conflict that the user must resolve.
- Symbolic links: describes whether a system allows revision control of symbolic links as with regular files. Versioning symbolic links is considered by some people a feature and some people a security breach (e.g., a symbolic link to /etc/passwd). Symbolic links are only supported on select platforms, depending on the software.
- Pre/post event hooks: indicates the capability to trigger commands before or after an action, such as a commit, takes place.
- Signed revisions: refers to integrated digital signing of revisions, in a format such as OpenPGP.
- Merge tracking: describes whether a system remembers what changes have been merged between which branches and only merges the changes that are missing when merging one branch into another.
- End of line conversions: describes whether a system can adapt the end of line characters for text files such that they match the end of line style for the operating system under which it is used. The granularity of control varies. Subversion, for example, can be configured to handle EOLs differently according to the file type, whereas Perforce converts all text files according a single, per-client setting.
- Tags: indicates if meaningful names can be given to specific revisions.
- International Support: Indicates if the software has support for multiple language environments and operating system
Advanced Features
Software | RCS keyword | Interactive commits | external references | partial checkout/clone | permissions | supported formats |
---|---|---|---|---|---|---|
AccuRev | Yes | ? | Yes | Yes | ? | ? |
Bazaar | No | ? | No | No | execution bit only | bzr, subversion[32], git[33], hg[34] |
CVS | Yes | No | ? | Yes[35] | ? | cvs |
Darcs | No | Yes | No | no[36] | ? | darcs |
Git | yes, but not recommended[37] | add --interactive[38] | Yes[39] | No | execution bit only | git, cvs, subversion, any that has a fastexporter |
Mercurial | bundled Keyword extension[40], although not recommended[41] | bundled Record extension[42] | via Forest extension[43] | No | execution bit only | hg, subversion[44], git[45], any other format supported by the Convert extension[46] |
SVK | ? | commit --interactive[citation needed] | ? | Yes | ? | subversion |
Subversion | Yes[47] | No | Yes[48] | Yes | Partial[49] | subversion |
Table explanation
- RCS keyword: Support of RCS commands
- Interactive commits: Interactive commits allow the user to cherrypick the patch-hunks that become part of a commit (leaving unselected changes as changes in the working copy), instead of having only a file-level granularity. See darcs record.
- external references: embedding of foreign repositories in the source tree
- partial checkout/clone: Ability to checkout or clone only a specified subdirectory from a repository.
- permissions: Tracks file permission bits in the revision history.
- supported formats: either read/write support or read-only (conversion, potentially repeated)
Basic Commands
Software | repository init | clone | pull | push | local branches | checkout | update | add | remove | move | copy | merge | commit | revert | generate bundle file | rebase |
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
AccuRev | mkdepot | mkstream | — | — | mkstream) | mkws / co | update / populate | add | defunct | move / rename | No | merge | keep / promote | revert | No | chstream |
Bazaar | init / init-repository / init-repo | branch / clone / get | pull | push | create-local-branch, list-local-branches, remove-local-branch (bzr-local-branches plugin) | checkout / co | update / up | add | remove / rm | move / mv / rename | No | merge | commit / ci / checkin | revert | send | rebase (rebase plugin) |
CVS | init | No | No | No | No | checkout / co / get | update / up | add | remove / rm | No | No | update -j | commit / ci | remove+update | No | No |
Darcs | init | get | pull | push | no[50] | get | pull | add | remove | move | No | pull / push | record | revert | send -o[51] | not applicable |
Git | init / init --bare | clone | fetch | push | branch | clone | pull | add | rm | mv | cp ... ; git add ... [52] | merge | commit | checkout | bundle | rebase |
Mercurial | init | clone | pull | push | yes (bundled extension[53]) | clone | pull -u | add | remove / rm | rename / mv | copy | merge | commit | revert | bundle | rebase (Rebase extension[54]) |
SVK | svk depotmap (or svnadmin create) | mirror | pull | push | svk copy can create local branches | checkout | update | add | delete / del / remove / rm | move / mv / rename / ren | copy / cp | merge / smerge | commit / ci | revert | No | smerge -I |
Subversion | svnadmin create | svnadmin hotcopy | (svnadmin load) | (svnadmin dump) | No | svn checkout / co | svn update / up | svn add | svn delete / del / remove / rm | svn move / mv / rename / ren | svn copy / cp | svn merge | svn commit / ci | svn revert | No | No |
Software | repository init | clone | pull | push | local branches | checkout | update | add | remove | move | copy | merge | commit | revert | generate bundle file | rebase |
Table Explanation
- repository init: Create a new empty repository (i.e., version control database)
- clone: Create an identical instance of a repository (in a safe transaction)
- pull: Pull revisions from a remote repository into a local repository
- push: Push revisions from a local repository into a remote repository
- local branches: Create a local branch that does not exist in the original remote repository
- checkout: Create a local working copy from a (remote) repository
- update: Update the files in a working copy with the latest version from a repository
- add: Mark specified files to be added to repository at next commit
- remove: Mark specified files to be removed from repository at next commit (note: keeps revision history)
- move: Mark specified files to be moved to a new location at next commit
- copy: Mark specified files to be copied (similar to hard links created by ln) at next commit
- merge: Apply the differences between two sources to a working copy path
- commit: Send changes from your working copy to the (local or remote) repository
- revert: Restore working copy file from repository
- generate bundle file: Create a file that contains a compressed set of changes to a given repository
- rebase: Forward-port local commits to the updated upstream head
Advanced Commands
Software | command aliases | lock/unlock | shelve/unshelve | rollback | cherry-picking | bisect | incoming/outgoing | grep |
---|---|---|---|---|---|---|---|---|
AccuRev | No | enable file locking[clarification needed] | keep / co | revert / purge[clarification needed] | patch[clarification needed] | No | No | No |
Bazaar | alias | No | shelve/unshelve | uncommit | merge (non-tracking) | bisect (bisect plugin) | missing --theirs-only/missing --mine-only | No |
Darcs | No | No | No | unrecord | yes[55] | trackdown[56] | ? | ? |
Git | in '.gitconfig' file | No | stash/stash pop[57] | reset --hard HEAD^ | cherry-pick | bisect | cherry | grep |
Mercurial | in '.hgrc' file | No | shelve/unshelve (bundled extension[58]) | rollback | transplant (bundled extension[59]) | bisect | incoming/outgoing | grep |
SVK | No | No | No | No | svk merge | No | status[60] | No |
Subversion | No | svn lock/unlock | No | No | svnmerge cherry-picking | ? | status -u[61] | No |
Team Foundation Server | ? | Yes | Yes | ? | ? | ? | ? | ? |
Software | command aliases | lock/unlock | shelve (stash)/unshelve | rollback | cherry-picking | bisect | incoming/outgoing | grep |
Table Explanation
- command aliases: create custom aliases for specific commands or combination thereof
- lock/unlock: exclusively lock a file to prevent others from editing it
- shelve/unshelve: temporarily set aside part or all of the changes in the working directory
- rollback: remove a patch/revision from the history and destroy it, unsafe on non-private repostories
- cherry-picking: move only some revisions from a branch to another one (instead of merging the branches)
- bisect: binary search of a change
- incoming/outgoing: query the differences between the local repository and a remote one (the patches that would be fetched/sent on a pull/push)
- grep: grep files throughout the repository's history
User interfaces
Software | Web interfaces | Stand-alone GUIs | Integration and/or Plug-ins for IDEs |
---|---|---|---|
AccuRev | Yes | Windows (incl. explorer integration), Linux, Unix, Mac OS X, BeOS available | IDEA (AccuRev4IDEA), Eclipse, Visual Studio |
Bazaar | can use a plain webserver, webserve, loggerhead or Trac | Olive, bzr-gtk (GTK+), QBzr (Qt), TortoiseBZR (Windows) | Eclipse (BzrEclipse), Visual Studio (bzr-visualstudio), TextMate (TextMateBundle), Komodo IDE |
ClearCase | included, Clearcase Web Interface | older: MS Windows native, Motif-based GUI for Unix-like systems, TSO client for z/OS. | Emacs, Eclipse ( IBM Proprietary, Eclipse-CCase ), Visual Studio (IBM proprietary), KDevelop (standard?), IDEA (standard?, 1, 2) |
Code Co-op | Not necessary since entire project is replicated locally | Windows | ? |
CVS | cvsweb, ViewVC, others | TortoiseCVS (Windows Explorer), WinCVS, Mac OS X, GTK, Qt available | Eclipse (Team), KDevelop (standard), IDEA (standard), Emacs (standard VC), Komodo IDE |
CVSNT | cvsweb, ViewVC, others | Windows, Mac OS X, OS/400, GTK, Qt available | All those that support CVS, plus commercial plugins for SCCI, Bugzilla, Build |
darcs | darcs.cgi included; darcsweb, Trac | under development; TortoiseDarcs (Windows Explorer), Mac OS X (alpha) available | Eclipse (eclipsedarcs) |
Git | gitweb, wit, cgit, GitHub, gitorious, Trac | gitk, git-gui (Tcl/Tk), tig, TortoiseGit, qgit, gitg (GNOME/GTK), (h)gct (Qt), git-cola (Qt), Git Extensions (Windows Explorer) | Eclipse (JGit/EGit); Netbeans (NbGit); Visual Studio (Git Extensions); Emacs (extension for standard VC); TextMate (Git TextMate Bundle); Vim (VCSCommand plugin); IntelliJ IDEA >8.1 (standard feature); Komodo IDE; Anjuta |
GNU arch | ArchZoom | ArchWay (GTK2), TlaLog | Emacs (standard VC) |
IC Manage | included, P4Web, P4FTP | Windows, Linux, Unix, Mac OS X, BeOS available | Eclipse, Visual Studio (P4SCC), KDevelop (standard?), IDEA (standard?), Komodo IDE |
LibreSource Synchronizer | LibreSource | Windows, Linux, Unix, Mac OS X available [62] | ? |
Mercurial | included [63], Bitbucket, Trac | Hgk (Tcl/Tk), (h)gct (Qt), TortoiseHg (Windows Explorer, Nautilus) | Eclipse (Mercurial Eclipse), NetBeans ([50]), Visual Studio 2008 ([51]), Emacs, Vim (VCSCommand plugin), Komodo IDE |
Monotone | ViewMTN, TracMonotone, | Monotone-Viz (GTK+), Qt available | ? |
Perforce | included, P4Web, P4FTP | Windows, Linux, Unix, Mac OS X, BeOS available | Eclipse, Visual Studio (P4SCC), KDevelop (standard?), IDEA (standard?), Komodo IDE |
Plastic SCM | Not necessary since entire project is replicated locally | Windows, Linux, Unix, Mac OS X available | Eclipse, Visual Studio, JDeveloper |
StarTeam | included | Windows, Java, Eclipse, Visual Studio, BDS2006 integration, plus Java command-line | Visual Studio, JBuilder, Eclipse |
Subversion | Apache 2 module included, WebSVN, ViewSVN, ViewVC, Trac, SharpForge, sventon, Warehouse | Qt, TortoiseSVN (Windows Explorer), KDESVN, Java, Mac OS X[52], Nautilus | Eclipse (Subclipse, Subversive), Visual Studio (AnkhSVN, VisualSVN), Netbeans, IDEA (standard), KDevelop (standard), TextMate (SVNMate plugin), Emacs (standard VC), MonoDevelop (standard), Komodo IDE; Anjuta |
SVK | ? | ? | ? |
Synergy | via Telelogic Change interface | Windows (incl. explorer integration), Linux, Unix | Eclipse (Telelogic proprietary), Visual Studio (Telelogic proprietary), IDEA (Telelogic proprietary) |
Team Foundation Server | included (Sharepoint Server used for web services) | Windows included; MacOS, Unix available | Visual Studio. Java client for Eclipse IDE |
Vault | included | Windows, Unix-like, Mac OS X | Visual Studio 2003 and higher, Eclipse 3.2 and higher |
Visual SourceSafe | none included; SSWI, VSS Remoting | Windows included; Linux, Mac OS and Solaris using SourceOffSite; any Java VM using SourceAnyWhere | Visual Studio, IDEA (standard?) |
Software | Web interfaces | Stand-alone GUIs | Integration and/or Plug-ins for IDEs |
Table explanation
- Software: The name of the application that is described.
- Web Interface: Describes whether the software application contains a web interface. A web interface could allow the software to post diagnostics data to a website, or could even allow remote control of the software application.
- GUIs: A GUI is a graphical user interface. If a software product features a GUI its functionality can be accessed through application windows as opposed to accessing functionality based upon typing commands at the command prompt such as a DOS interface.
- Plug-ins: functionality is available through an Integrated Development Environment. Minimum functionality should be to list the revision state of a file and checkin/checkout files.
History and adoption
Software | History | Notable users |
---|---|---|
AccuRev | First publicly released in 2002 | Clients include: SanDisk, Sony, Orbitz, MCI, and Polycom[citation needed] |
Bazaar | Loosely related to baz | Ubuntu, Launchpad, KatchTV [53], MySQL |
BitKeeper | Evolved from Sun WorkShop TeamWare | Linux Kernel (2002-2005) and many companies [54] |
ClearCase | Developed beginning in 1990 by Atria Software, following concepts developed by Apollo Computer in DSEE during the 1980s. The most recent version is 7.1, released in 2008. | IBM, Cisco, Motorola, Siemens, Ericsson, Nokia and other large organizations worldwide[citation needed] |
Code Co-op | The first distributed VCS, demoed in 1997 [55], released soon after. | Clients include: Logitech, HP, Ericsson[citation needed] |
CVS | First publicly released July 3, 1986; based on RCS | thousands of organizations worldwide[citation needed] |
CVSNT | First publicly released 1998; based on CVS. Started by CVS developers with the goal adding support for a wider range of development methods and processes. | If you search the cvsnt, wincvs and tortoisecvs newsgroups for any Fortune 500 company you like you will see that almost any large company you care to name that develops software uses CVSNT.[citation needed] |
darcs | First announced on April 9, 2003 | DokuWiki, Mnet, Projects Using Darcs |
Git | Started by Linus Torvalds in April 2005, following the BitKeeper controversy.[64] | Linux kernel, GNOME, Perl 5 [56], X.Org, Cairo, Qt Software, Samba, OpenEmbedded, Ruby on Rails, Wine, Fluxbox, Openbox, Compiz Fusion, XCB, ELinks, XMMS2, e2fsprogs, GNU Core Utilities (Also see list of Git projects) |
GNU arch | Started by Tom Lord, it later became part of the GNU project. Lord resigned as maintainer in August 2005. | available for GNU Savannah and Gna.org projects |
IC Manage | Developed by IC Manage, Inc which was founded in 2003 by Shiv Sikand and Dean Drako. | many organizations worldwide [57] |
LibreSource Synchronizer | First publicly released on June 13, 2005 | Most of the LibreSource Community |
Mercurial | Started April 6, 2005 by Matt Mackall, following the BitKeeper controversy.[64] First released on April 19, 2005 | Mozilla, NetBeans, Xine, Xen, OpenJDK, OpenSolaris, wmii, MoinMoin, Linux-HA, Python[65] (Also see list of projects using Mercurial) |
Monotone | First released in April 2003 | coLinux, CTWM, Pidgin, Xaraya [58] |
Perforce | Developed by Perforce Software, Inc which was founded in 1995 by Christopher Seiwald. | many organizations worldwide [59], FreeBSD[60] |
Plastic SCM | Developed by Codice Software, Inc which was founded in 2005 by Pablo Santos and David Suarez | many organizations[citation needed] |
Revision Control System | July 1985 | RCS is generally (but not always) superseded by other systems such as CVS, which began as a wrapper on top of RCS. |
Source Code Control System | 1972 | as the POSIX source-control tool, SCCS is widely available on UNIX platforms. Sun WorkShop TeamWare uses SCCS files. |
StarTeam | Developed by StarBase software, acquired by Borland(which was acquired by Micro Focus). | Borland, BT, Cintas, EDS, Kaiser Permanente, Met Office, Quest Software, Raymond James, Siemens, and many more globally distributed companies[61] |
Subversion | Started in 2000 by CVS developers with goal of replacing CVS | ASF, SourceForge, FreeBSD, Google Code, KDE, GCC, Ruby, Mono, PuTTY, Zope, Xiph, GnuPG, CUPS, Wireshark, TWiki, Django, and many organizations worldwide [62] |
SVK | Authored by Chia-liang Kao with Audrey Tang. First version was on November 19, 2003. 1.00 on May 9, 2005. 2.0.0 on Dec 28th, 2006. SVK became a product of Best Practical on June 5, 2006. | Request Tracker |
Synergy | Developed beginning in 1988 by Caseware, as AmplifyControl. The company was renamed Continuus in 1994, where the product became better known as Continuus/CM. Continuus was acquired by Telelogic in 1999 shortly after going public; the product is now known as Telelogic Synergy. | Nokia, Philips, Raytheon, Morgan Stanley, Friends Provident, Boeing, Lockheed Martin, Siemens and other small, medium and large organizations worldwide[citation needed] |
Team Foundation Server | First publicly released on March, 2006 | Available on CodePlex, Microsoft itself and other large organizations worldwide[citation needed] |
Vault | First publicly released in February, 2003 | ? |
Visual SourceSafe | originally created by a company called One Tree Software, version 3.1. Company was bought by Microsoft which released version 4.0 of VSS around 1995 | ? |
Software | History | Notable users |
Table Explanation
- Software: The name of the application that is described.
- Notable users: is a list of well known projects using the software as their primary revision control system, excluding the software itself, followed by a link to a full list if available.
- History: briefly describes the software's origins and development.
Notes
- ^ Bazaar is a Distributed version control system but it can also be used in a centralized manner using lock step development and checkouts.
- ^ In ClearCase, a trigger may be set to allow for the lock model, and this is done at many sites. However, ClearCase development usually takes place on private branches where each developer is given their own branch, so the lock vs. merge concurrency model doesn't matter as much. Code is merged back to the main branch once the developer is ready to deliver their code to the project.
- ^ As of version 2.5, "LibreSource is now released under GPL Version 2".
- ^ SVK allows Subversion to have Distributed branches.
- ^ In Subversion, a file attribute enables the lock model on per-file basis. This file attribute can be set automatically using file name wildcard expressions.
- ^ "The Future of SVK". May 28, 2009. Retrieved June 6, 2009.
- ^ Bazaar's critical modules are written in Pyrex. They are automatically translated to pure C; except for the patience sorting module, used in merge resolution, which is written directly in the C language.
- ^ A Bazaar bundle is a summary diff, with sufficient extra information to preserve history.
- ^ Mercurial revision numbers are local to a repository; they can differ from repository to repository depending on in which order merges are performed.
- ^ "Mercurial 0.5b vs git". overview of performance/scalability. Retrieved 2006-12-05.
- ^ A Monotone's revisions represent changesets and its manifests represent snapshots, each revision is linked to some manifest. But manifests are legacy constructs, they aren't kept in the database anymore and reconstructed on the fly if needed. The real work now happen in rosters which are hybrid snapshot/changeset structures.
- ^ They can be automatically generated[1] and manually verified, but verification is not automatic
- ^ EOL conversions are supported since bzr 1.14
- ^ Support Policy for National Languages and ClearCase
- ^ Support multi lingual filenames (across clients and servers with different codepages) and unicode text files.
- ^ darcs' patches each bear a unique identifier, it's pretty much impossible to merge twice the same patch in a repository
- ^ Git itself is not internationalized, just git-gui and gitk (both are shipped with git).
- ^ Its possible to embed the action in a shell or Ant script.
- ^ A merged is tracked by its workspace origin.
- ^ Mercurial versions 0.9.4 and higher support symlinks.
- ^ Mercurial is in the process of being translated to at least dutch and chinese
- ^ It could be done via user level hooks
- ^ Perforce Knowledge Base: Renaming Files
- ^ StarTeam supports atomic commits as of version 2006
- ^ Subversion can move a file and conserve its history, if and only if the target of the move is in the same Subversion repository as the source. Cross-repository moves require third-party tools such as svk. Also, a rename operation is actually a copy-with-history-and-delete sequence.
- ^ New to SVN 1.5 ([2]). A separate tool "svnmerge" ([3]) provides merge tracking for older versions.
- ^ In Subversion, tags are a special case of the more generic "cheap copy" concept of Subversion. Per convention, a tag is a copy into a directory named "tags". Because of this, even tags are versioned. See [4] for more information. The reason for partial support in the table is because Subversion's emulation of tags in this manner does not meet the requirement that the tag name can be used in place of any revision identifier wherever the user may be required to enter one. This column would be meaningless if the definition were to be loosened enough to encompass Subversion's approach as every version control system supports branching and would therefore support tags as well.
- ^ Uses subversion server
- ^ Signature - SVK Wiki
- ^ Version change history is removed upon rename; old name not referenced.
- ^ Note that VSS Shares do not support anything like actual Unix symbolic links
- ^ bzr-svn
- ^ bzr-git
- ^ bzr-hg
- ^ Using alias of the CVSROOT/modules file.
- ^ Darcs can do sparse checkouts from explicit checkpoints on darcs-1 repositories, but not from darcs-2 ones[citation needed]
- ^ The Git FAQ states that keyword expansion is not a good thing, see the Git FAQ
- ^ git-add(1) Manual Page
- ^ git-submodule(1) Manual Page
- ^ Mercurial KeywordExtension page
- ^ Why You Don't Need [Keyword Substitution]
- ^ Mercurial RecordExtension page
- ^ hgforest repository
- ^ hgsubversion page
- ^ Hg-Git Mercurial Plugin
- ^ Mercurial ConvertExtension page
- ^ Keyword Substitution
- ^ Externals Definitions
- ^ SVN records file permissions when a file is added, but does not allow changing them later on.
- ^ darcs doesn't have named branches, local or not, branching is handled solely through repository cloning
- ^ darcs send prepares a bundle of patches, defaults to sending it by mail but can send it to a file instead
- ^ copies are detected after the fact, much like renames
- ^ Mercurial Bookmarks extension page
- ^ Mercurial Rebase Project page
- ^ darcs operate on patches not revision, cherrypicking simply consists in pulling a given patch from one repository to another one as long as the dependencies are fulfilled
- ^ trackdown performs an automated search by repeatedly running a provided command on previous revisions on the working copy until the command succeeds (doesn't return an error code)
- ^ git stash is a multi-level shelve, it's possible to shelve several change groups at the same time
- ^ Mercurial Shelve extension page
- ^ Mercurial Transplant extension page
- ^ svk status lists differences between working copy and repository, not differences between two repositories
- ^ svn status lists differences between working copy and repository, not differences between two repositories
- ^ Any OS that support a Java Virtual Machine 1.5
- ^ hgweb for single-repository access and hgwebdir for multiple repository access from a single HTTP address
- ^ a b Towards A Better SCM: Revlogs and Mercurial, presented by Matt Mackall to the Ottawa Linux Symposium, July 2006
- ^ transition ongoing
See also
External links
- Comparison between Git and Mercurial by Google (summer 2008)
- Comments on Open Source Software / Free Software SCM systems by David A. Wheeler
- Quick Reference Guide to Free Software Decentralized Revision Control Systems by Zooko
- Comparison of commercial Version Control Systems from the creators of Code Co-op
- Version Control System Comparison from better-scm.berlios.de
- Evaluation of distributed source code management solutions for OpenSolaris by Sun
- Comparison of CVS and Subversion
- Version control systems comparison