Some people wish AD was in CVS Since they she could do "cvs up" and "svn commit" to keep AD in sync in a client svn repo. After a little pondering, I think you can actually get the same workflow using our not-highly-publicized bzr branch of AD. Note that the most recent versions of bzr come with a tortoise-like GUI for windoze even (I haven't tried it yet). Also, bzr can directly integrate with svn via svn 1.6 clients, though I haven't played much with this yet. I just updated to bzr 2.0.1 for OS 10.5 via the dmg here: http://wiki.bazaar.canonical.com/Download from 1.8 something I had before. Also, note that I'm using a lightweight co from bzr - thus the overhead of the .bzr files (~1.6 MB) is modest compared to the whole size of AD (~60 MB) - here are the file totals after running the operations below: $ du -h -d1 1.6M ./.bzr 216K ./.svn 1.8M ./includes 832K ./misc 58M ./modules 76K ./profiles 68K ./scripts 56K ./sites 3.5M ./themes 66M . The test of the workflow - start with Acquia Drupal 1.2.18 and commit to svn, and then make a local change, commit to svn, then update to the latest 1.2.20 cquia Drupal. For test purposes I start by making a local svn repo, so the svn ops are fast. $ cd /tmp $ svnadmin create svntrash $ svn mkdir file:///tmp/svntrash/trunk $ svn co file:///tmp/svntrash/trunk $ cd trunk/ here we get an old rev of Acquia Drupal to test the update, then add all the files (and dot files) to svn and commit. $ bzr co --lightweight -r12 lp:~acquia/drupal/1.x-6.x . $ svn add * $ svn add .bzr* $ svn add .htaccess $ svn ci -m"Acquia Drupal via bzr co -r12" Now we make a local change to .htaccess $ nano .htaccess $ svn diff $ svn ci -m"local patch" Now we update to the lastest Acquia Drupal: $ bzr up See lots of merge action happening, but generated messages like "Conflict: can't delete [path] because it is not empty. Not deleting.." for 3x directories that bzr wanted to remove, but which still contained .svn directories. So I had to manually svn rm those - this is a rare case. $ svn rm modules/acquia/apachesolr/contrib/apachesolr_attachments $ svn rm modules/acquia/apachesolr/contrib/apachesolr_multisitesearch $ svn rm modules/acquia/link/po after this, bzr reports we are up to date, and update makes no changes: $ bzr up Now we take care of normal files that were added or removed, and commit the result to svn. $ svn status $ svn status | grep '^!' | tr -d '!' | xargs svn rm $ svn status | grep '^\?' | tr -d '?' | xargs svn add $ svn ci -m"bzr update to current Acquia Drupal (r15)" We can then still see the local patch compared to the stock code using bzr diff: $ bzr diff === modified file '.htaccess' ... -- Peter M. Wolanin, Ph.D. Momentum Specialist, Acquia. Inc.