Difference between revisions of "Mercurial/Migration"
From Apache OpenOffice Wiki
(→Mapping OOo CVS and SVN development branches to Mercurial) |
|||
| Line 17: | Line 17: | ||
! HG | ! HG | ||
|- | |- | ||
| − | | /trunk | + | | <svnroot>/trunk |
| DEV300 | | DEV300 | ||
|- | |- | ||
| − | | /branches/OOO320 | + | | <svnroot>/branches/OOO320 |
| OOO320 | | OOO320 | ||
|- | |- | ||
| − | | / | + | | <svnroot>/branches/OOO310 |
| − | | | + | | OOO310 |
|- | |- | ||
| − | | /cws/ | + | | <svnroot>/cws/vcl95 |
| − | | cws/ | + | | cws/vcl95 |
|- | |- | ||
| − | | /cws/... | + | | <svnroot>/cws/vcl96 |
| + | | cws/vcl96 | ||
| + | |- | ||
| + | | <svnroot>/cws/... | ||
| cws/... | | cws/... | ||
|- | |- | ||
|} | |} | ||
Revision as of 18:14, 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. |
Subversion branches are mapped as follows
| SVN | HG |
|---|---|
| <svnroot>/trunk | DEV300 |
| <svnroot>/branches/OOO320 | OOO320 |
| <svnroot>/branches/OOO310 | OOO310 |
| <svnroot>/cws/vcl95 | cws/vcl95 |
| <svnroot>/cws/vcl96 | cws/vcl96 |
| <svnroot>/cws/... | cws/... |
