Changes between Version 5 and Version 6 of UsingGitAndSvnInTrac

Show
Ignore:
Timestamp:
05/06/10 22:40:58 (4 years ago)
Author:
cotto
Comment:

make intro less stupid

Legend:

Unmodified
Added
Removed
Modified
  • UsingGitAndSvnInTrac

    v5 v6  
    11(Keeping two revision control systems around is a bad idea. It doubles the maintenance burden, doubles the points of potential failure, and saddles us with maintaining the old system even if we transition to yet a fourth revision control system down the road. If we made the transition, we would have to make it completely, which means figuring out ahead of time how to handle referring to specific revisions, both old and new. --ANR) 
    22 
    3 So Subversion is old and busted and git is the new hawtness.  This is established and completely beyond question.  Don't question it.  Also, I've wasted way too much time wrestling with svn's stupid quirks and failures, so I want Parrot to switch to using Git as its primary vcs.  The only problem is that Parrot has a lot of links and references to subversion revision numbers, both on this Trac site, in the source, in old messages, lots of places.  We don't want these to break and make people sad.  That means that even after we switch to Git, we'll need to keep the Subversion repository accessible using current links. 
     3There is a movement within the Parrot development community toward switching to a git as our primary version control system.  Most of the [wiki:GitObjections objections to git] have been addressed and the largest remaining technical problem is backwards compatibility.  Various facets of the Parrot project have direct links and references to subversion revision numbers, e.g. on the Trac site, in the source, in mailing lists and probably elsewhere.  We don't want these to break.  That means that as part of the transition to Git, we'll need to ensure that current links to subversion revisions will continue to lead to a page which displays the correct changeset. 
    44 
    5 Oh noes!  Trac isn't meant to have multiple version control backends, you might say.  There's a solution: 
     5A few different options exists to allow Parrot to move to git while maintaining link backwards-compatibility.  The first option is to use a single Git backend to Trac.  The second option is use Trac with multiple vcs backends, i.e. read-only for subversion and read-write for git.   
     6 
     7== Trac with a Single Git Backend == 
     8 
     9This space unintentionally left blank. 
     10 
     11== Trac with Multiple VCS Backends == 
     12 
     13A small problem exists in the fact that Trac isn't meant to have multiple version control backends.  There's a solution: 
    614 * [http://trac-hacks.org/browser/subprojectspatch/0.11/sub-projects.diff This tiny patch] allows a Trac project to have a sub-project. 
    715 * The sub-project can be configured to use the same db as the parent project, propagating permissions and user info. 
     
    1018 * A more or less usable [http://trac-hacks.org/wiki/GitPlugin Git plugin] exists for Trac. 
    1119 
    12 Using these tools, here's the plan (as it exists): 
     20Using these tools, here's a possible plan: 
    1321 * Keep Subversion as the version control backend on the current Trac project (the parent). 
    1422 * Add a subproject (the child) which uses Git as the vc backend. 
     
    1927   * Make all navigation items in the child project point at the parent. 
    2028 
    21 This will allow Git and Subversion to integrate gracefully with Trac and will preserve links to Subversion revision numbers.  There are still some holes to fill in but that's more or less the plan.  I (cotto) will make sure all the pieces exist and can be made to fit together before seriously proposing anything. 
     29This would allow Git and Subversion to integrate gracefully with Trac and will preserve links to Subversion revision numbers.  There are still some holes to fill in but that's more or less the plan.  I (cotto) will make sure all the pieces exist and can be made to fit together before seriously proposing anything. 
    2230 
    2331remaining issues: