Change VCS - Revision history

Kris: dev discussion

2012-01-04T20:08:10Z

dev discussion

← Older revision		Revision as of 20:08, 4 January 2012
Line 1:		Line 1:
	{{outdated}}		{{outdated}}
			{{DevDiscussion}}

	With version 0.47 coming along, the idea was brought up to change for a new version control system which would ease refactoring in particular. This page summarizes [http://thread.gmane.org/gmane.comp.graphics.inkscape.devel/25255/focus=25274 various email threads]. The project is to use a Distributed Version Control System instead of subversion.		With version 0.47 coming along, the idea was brought up to change for a new version control system which would ease refactoring in particular. This page summarizes [http://thread.gmane.org/gmane.comp.graphics.inkscape.devel/25255/focus=25274 various email threads]. The project is to use a Distributed Version Control System instead of subversion.

Kris at 19:54, 4 January 2012

2012-01-04T19:54:58Z

← Older revision		Revision as of 19:54, 4 January 2012
Line 1:		Line 1:
			{{outdated}}
	With version 0.47 coming along, the idea was brought up to change for a new version control system which would ease refactoring in particular. This page summarizes [http://thread.gmane.org/gmane.comp.graphics.inkscape.devel/25255/focus=25274 various email threads]. The project is to use a Distributed Version Control System instead of subversion.		With version 0.47 coming along, the idea was brought up to change for a new version control system which would ease refactoring in particular. This page summarizes [http://thread.gmane.org/gmane.comp.graphics.inkscape.devel/25255/focus=25274 various email threads]. The project is to use a Distributed Version Control System instead of subversion.

Kris at 18:59, 4 January 2012

2012-01-04T18:59:31Z

← Older revision		Revision as of 18:59, 4 January 2012
Line 1:		Line 1:
	With [[0.~~47_Refactoring_Plan]]~~ coming along, the idea was brought up to change for a new version control system which would ease refactoring in particular. This page summarizes [http://thread.gmane.org/gmane.comp.graphics.inkscape.devel/25255/focus=25274 various email threads]. The project is to use a Distributed Version Control System instead of subversion.		With version 0.47 coming along, the idea was brought up to change for a new version control system which would ease refactoring in particular. This page summarizes [http://thread.gmane.org/gmane.comp.graphics.inkscape.devel/25255/focus=25274 various email threads]. The project is to use a Distributed Version Control System instead of subversion.

	As a general source of information, see http://en.wikipedia.org/wiki/Comparison_of_revision_control_software		As a general source of information, see http://en.wikipedia.org/wiki/Comparison_of_revision_control_software

Mfloryan: /* Links */

2008-04-02T13:16:50Z

Links

← Older revision		Revision as of 13:16, 2 April 2008
Line 70:		Line 70:
	* [http://doc.bazaar-vcs.org/bzr.dev/en/tutorials/using_bazaar_with_launchpad.html Bazaar in Lanunchpad]		* [http://doc.bazaar-vcs.org/bzr.dev/en/tutorials/using_bazaar_with_launchpad.html Bazaar in Lanunchpad]
	* [http://bazaar-vcs.org/Workflows Bazaar workflows]		* [http://bazaar-vcs.org/Workflows Bazaar workflows]

	* Google talk videos on '''GIT''' [http://video.google.com/videoplay?docid=-2199332044603874737] [http://www.youtube.com/watch?v=8dhZ9BXQgc4]		* Google talk videos on '''GIT''' [http://video.google.com/videoplay?docid=-2199332044603874737] [http://www.youtube.com/watch?v=8dhZ9BXQgc4]
	* [http://git.or.cz/course/svn.html SVN Course]		* [http://git.or.cz/course/svn.html SVN Course]

Mfloryan: small changes

2008-04-02T13:16:32Z

small changes

← Older revision		Revision as of 13:16, 2 April 2008
Line 63:		Line 63:
	Not sure		Not sure
	* A good point is that bazaar supports renames but it could actually be considered a "Bad" by git users		* A good point is that bazaar supports renames but it could actually be considered a "Bad" by git users

			== (D)VCS Clients ==

			== Links ==
			* [http://bazaar-vcs.org/BzrWhy Bazaar Why]
			* [http://doc.bazaar-vcs.org/bzr.dev/en/tutorials/using_bazaar_with_launchpad.html Bazaar in Lanunchpad]
			* [http://bazaar-vcs.org/Workflows Bazaar workflows]

			* Google talk videos on '''GIT''' [http://video.google.com/videoplay?docid=-2199332044603874737] [http://www.youtube.com/watch?v=8dhZ9BXQgc4]
			* [http://git.or.cz/course/svn.html SVN Course]

Jiho: /* Bazaar */

2008-03-17T13:35:48Z

Bazaar

← Older revision		Revision as of 13:35, 17 March 2008
Line 52:		Line 52:
	** Changes state of bugs in LP when committing in Bazaar		** Changes state of bugs in LP when committing in Bazaar
	** Web interface for creating branches quickly and easily		** Web interface for creating branches quickly and easily
	* supports renames (could be considered a - by git users)
	* supports bundling changesets		* supports bundling changesets
	* tortoiseBZR		* tortoiseBZR
Line 61:		Line 60:
	Bad		Bad
	* no support for line-endings conversion/convention enforcing (but such systems may create the risk of wrongly recognizing binary files)		* no support for line-endings conversion/convention enforcing (but such systems may create the risk of wrongly recognizing binary files)

			Not sure
			* A good point is that bazaar supports renames but it could actually be considered a "Bad" by git users

Jiho: /* Git */ added some stuff about git's commit behavior

2008-03-17T13:34:59Z

Git: added some stuff about git's commit behavior

← Older revision		Revision as of 13:34, 17 March 2008
Line 32:		Line 32:
	* revisions are indicated with SHA's rather than numbers		* revisions are indicated with SHA's rather than numbers
	* commands dissimilar to what we're used to with svn (e.g., no 'git update')		* commands dissimilar to what we're used to with svn (e.g., no 'git update')
	* have to git add all modified files before committing them (or resort to a non specific commit -a)
	* no decent GUI (for windows?)		* no decent GUI (for windows?)

			Not sure
			* have to git add all modified files before committing them or resort to `git commit -a`. This is shift from the SVN way of doing things. However with single files, `git commit filename` is equivalent to `svn commit filename`. Plus, with multiple files git basic workflow is probably more powerful: it allows to add a set of files to a commit and only then to actually do the commit. The same thing with svn (or other similarly behaving systems) requires to write a long list of files in a single command line.

	=== Mercurial (Hg) ===		=== Mercurial (Hg) ===

Jiho: Initiated the page as a summary from the long email thread

2008-03-17T13:24:06Z

Initiated the page as a summary from the long email thread

New page

With [[0.47_Refactoring_Plan]] coming along, the idea was brought up to change for a new version control system which would ease refactoring in particular. This page summarizes [http://thread.gmane.org/gmane.comp.graphics.inkscape.devel/25255/focus=25274 various email threads]. The project is to use a Distributed Version Control System instead of subversion.

As a general source of information, see http://en.wikipedia.org/wiki/Comparison_of_revision_control_software

== Why change? ==

Several things make a DVCS preferable to subversion for Inkscape:
* speed
* local commits allow to commit often
* easier branching and merging, which is likely to be useful for feature work or Summer of Code work while the core is refactored
* ... add your favorite feature from the wikipedia page above

This does not come without cost either:
* someone must move the code to the new system
* each dev must potentially learn a new system

== Comparison of DVCS ==

Since past discussions seemed to lead to the concensus that the benefits outweigh the cost, the question remaining is which DCVS to use. The three main contenders are [http://git.or.cz/ git], [http://www.selenic.com/mercurial/ mercurial] and [http://bazaar-vcs.org/ bazaar]. Here is a list of the their cost and benefits in the context of Inkscape development

=== Git ===
Good
* faster: local commits: <1s vs 4s, push a new branch: instantaneous vs 35 min
* ability to follow chunk of codes around, without relying on file names. Probably useful from a refactoring point of view
* probably the fastest growing user base => many tools
* TextMate bundle

Bad
* git is designed with the Linux kernel's hierarchical workflow in mind (few 'push'ers to the central repos), so may require alteration in how Inkscape's workflow works (any dev can commit)
* we would need to set up and administer this ourselves
* revisions are indicated with SHA's rather than numbers
* commands dissimilar to what we're used to with svn (e.g., no 'git update')
* have to git add all modified files before committing them (or resort to a non specific commit -a)
* no decent GUI (for windows?)

=== Mercurial (Hg) ===
Good
* tortoiseHG (remains to be evaluated)
* TextMate bundle

Bad

===Bazaar===
Good
* already integrated in [[http://doc.bazaar-vcs.org/bzr.dev/en/tutorials/using_bazaar_with_launchpad.html launchpad]]
** Associating branches to bugs
** Associating branches to blueprints
** Changes state of bugs in LP when committing in Bazaar
** Web interface for creating branches quickly and easily
* supports renames (could be considered a - by git users)
* supports bundling changesets
* tortoiseBZR
* Fewer commands - makes it easier to learn
* Supports multiple workflows, including what we use for Inkscape (See http://bazaar-vcs.org/Workflows)
* Easy administration. Mostly done through Launchpad, plus Bzr folks are available to help.

Bad
* no support for line-endings conversion/convention enforcing (but such systems may create the risk of wrongly recognizing binary files)