Changes between Version 2 and Version 3 of faq/gitification


Ignore:
Timestamp:
May 25, 2012, 2:16:25 PM (7 years ago)
Author:
Bart
Comment:

Explaining the motivation of git-subtree

Legend:

Unmodified
Added
Removed
Modified
  • faq/gitification

    v2 v3  
    55Until May 2012,[https://linksunten.indymedia.org/ Indymedia linksunten] used the Good Old Fashioned Way™ to keep track of upstream changes to it's [http://drupal.org/ Drupal] (in fact: [http://pressflow.org/ Pressflow]) core and modules: [http://drupal.org/project/drush drush] dl mymodule. At least in theory. In reality, the core has been patched twice, many modules even more and some self-written modules do not even exist in a public drupal repository. linksunten has some 80 modules installed and keeping track of updates is wearisome for the non-patched modules and troublesome for the patched modules. We learned that a version control system could ease the error-prone update procedure and as drupal.org has switched to [/wiki/git git] we decided to do the same.
    66
    7 Since a Drupal website is not a monolithic block and nearly each module is maintained by a different developer team we needed to find a way to update the core and each module separately from one another. The traditional way git offers for this is a concept called [http://git-scm.com/book/en/Git-Tools-Submodules git-submodule]. It complicated, unintuitive and detested by many for good reasons. But as git follows the [http://en.wikipedia.org/wiki/There%27s_more_than_one_way_to_do_it TMTOWTDI] paradigm we could avoid using git-submodule and settled for [https://github.com/apenwarr/git-subtree git-subtree] instead which has recently been [https://github.com/apenwarr/git-subtree/commit/8cd698957f57f62ec3d313403bebced2fdf751e5 merged] into git core.
     7Since a Drupal website is not a monolithic bloc and nearly each module is maintained by different developers we needed to find a way to update the core and each module separately from one another. The traditional way git offers for this is a concept called [http://git-scm.com/book/en/Git-Tools-Submodules git-submodule]. It complicated, unintuitive and detested by many for good reasons. But as git follows the [http://en.wikipedia.org/wiki/There%27s_more_than_one_way_to_do_it TMTOWTDI] paradigm we could avoid using git-submodule and settled for [https://github.com/apenwarr/git-subtree git-subtree] instead which has recently been [https://github.com/apenwarr/git-subtree/commit/8cd698957f57f62ec3d313403bebced2fdf751e5 merged] into git core. Besides the possibility to update the core and each module separately and replaying our patches to the updated version automatically, we want the linksunten code to be one git repository which simply "works" after cloning it. After our move to git we will use the [http://drupal.org/project/features features] module to version control as much of our configuration data as possible.