Difference between revisions of "Mercurial/Migration"
From Apache OpenOffice Wiki
m (→Mapping OOo CVS and SVN development branches to Mercurial) |
|||
| Line 4: | Line 4: | ||
= Mapping OOo CVS and SVN development branches to Mercurial = | = Mapping OOo CVS and SVN development branches to Mercurial = | ||
| − | In the Openoffice.org Mercurial setup CVS and SVN branches are represented by a repository of their own. This is a common setup for a DSCM, although all of the big three DSCMs (Git, Bazaar and Mercurial) support mechanisms to keep more than one branch in one repository. Our development process doesn't really require us to keep more than one branch | + | In the Openoffice.org Mercurial setup CVS and SVN branches are represented by a repository of their own. This is a common setup for a DSCM, although all of the big three DSCMs (Git, Bazaar and Mercurial) support mechanisms to keep more than one branch in one repository. Our development process doesn't really require us to keep more than one branch per repository so we can spare us the additional complexity. |
{{Template:Documentation/Caution| In the DSCM world the word "branch" describes several quite varying concepts. So called "named branches" are the closest Mercurial representation of what a branch inside one repository would be for CVS and SVN users.}} | {{Template:Documentation/Caution| In the DSCM world the word "branch" describes several quite varying concepts. So called "named branches" are the closest Mercurial representation of what a branch inside one repository would be for CVS and SVN users.}} | ||
{{Template:Documentation/Tip| Just because the "official" repositories contain no branches doesn't mean that you can't use branches in your daily work. Actually you will work with several [http://mercurial.selenic.com/wiki/Head ''heads''] every time you do merge work. If you want to keep long term branches in your working repository use [http://mercurial.selenic.com/wiki/NamedBranches ''named branches''] or [http://mercurial.selenic.com/wiki/BookmarksExtension ''bookmarks'']}} | {{Template:Documentation/Tip| Just because the "official" repositories contain no branches doesn't mean that you can't use branches in your daily work. Actually you will work with several [http://mercurial.selenic.com/wiki/Head ''heads''] every time you do merge work. If you want to keep long term branches in your working repository use [http://mercurial.selenic.com/wiki/NamedBranches ''named branches''] or [http://mercurial.selenic.com/wiki/BookmarksExtension ''bookmarks'']}} | ||
Revision as of 12:56, 22 October 2009
Mapping OOo CVS and SVN development branches to Mercurial
In the Openoffice.org Mercurial setup CVS and SVN branches are represented by a repository of their own. This is a common setup for a DSCM, although all of the big three DSCMs (Git, Bazaar and Mercurial) support mechanisms to keep more than one branch in one repository. Our development process doesn't really require us to keep more than one branch per repository so we can spare us the additional complexity.
 |
In the DSCM world the word "branch" describes several quite varying concepts. So called "named branches" are the closest Mercurial representation of what a branch inside one repository would be for CVS and SVN users. |
