pressflow update 6.19

root@ubuntu:/mnt/apci/main/www# bzr status -v
modified:
  CHANGELOG.txt
  UPGRADE.txt
  includes/actions.inc
  includes/bootstrap.inc
  includes/common.inc
  includes/database.pgsql.inc
  includes/file.inc
  includes/form.inc
  includes/language.inc
  includes/locale.inc
  includes/lock.inc
  includes/mail.inc
  includes/path.inc
  includes/xmlrpc.inc
  includes/xmlrpcs.inc
  install.php
  modules/aggregator/aggregator.info
  modules/aggregator/aggregator.module
  modules/block/block.info
  modules/blog/blog.info
  modules/blogapi/blogapi.info
  modules/book/book.info
  modules/color/color.info
  modules/comment/comment.info
  modules/comment/comment.module
  modules/contact/contact.info
  modules/dblog/dblog.info
  modules/filter/filter.info
  modules/filter/filter.module
  modules/forum/forum.info
  modules/help/help.info
  modules/locale/locale.info
  modules/menu/menu.admin.inc
  modules/menu/menu.info
  modules/node/node.info
  modules/node/node.module
  modules/openid/openid.info
  modules/path/path.info
  modules/php/php.info
  modules/ping/ping.info
  modules/poll/poll.info
  modules/poll/poll.module
  modules/profile/profile.info
  modules/search/search.info
  modules/search/search.module
  modules/statistics/statistics.admin.inc
  modules/statistics/statistics.info
  modules/statistics/statistics.module
  modules/syslog/syslog.info
  modules/system/system.info
  modules/system/system.install
  modules/system/system.module
  modules/taxonomy/taxonomy.admin.inc
  modules/taxonomy/taxonomy.info
  modules/taxonomy/taxonomy.module
  modules/throttle/throttle.info
  modules/tracker/tracker.info
  modules/translation/translation.info
  modules/trigger/trigger.info
  modules/update/update.compare.inc
  modules/update/update.info
  modules/update/update.install
  modules/upload/upload.info
  modules/upload/upload.module
  modules/user/user.info
  modules/user/user.module
  modules/user/user.pages.inc
  themes/bluemarine/bluemarine.info
  themes/chameleon/chameleon.info
  themes/chameleon/marvin/marvin.info
  themes/engines/phptemplate/phptemplate.engine
  themes/garland/garland.info
  themes/garland/minnelli/minnelli.info
  themes/garland/template.php
  themes/pushbutton/pushbutton.info
unknown:
  crossdomain.xml
  file_import.php
  import_files/
  rb.php
  rebuild_mods.php
  rrd/
  sitemap.xml
  includes/image.imagemagick.inc
  modules/loadcache/
  modules/lock/
  scripts/nettest.pl
  sites/scripts/
  sites/all/libraries/
  sites/all/modules/
  sites/all/themes/
  sites/default/backstruct.sh
  sites/default/backup.sh
  sites/default/cacheclear.sql
  sites/default/default_env_settings.php
  sites/default/dev-to-prod.sh
  sites/default/fullbackup.sh
  sites/default/getdev.sh
  sites/default/global_app_settings.php
  sites/default/restore.sh
  sites/default/themes/
pending merges:
  David Strauss 2010-06-19 Add file_directory_strip() to support private dow...
    David Strauss 2010-06-18 [merge] Drupal 6.17 (via testing branch)
    David Strauss 2010-06-14 Fix double output from page caching. Deliver pr...
    David Strauss 2010-06-14 [merge] Drupal 6.17
    David Strauss 2010-06-02 Drupal 6.17
root@ubuntu:/mnt/apci/main/www# bzr commit
Committing to: /mnt/apci/main/www/                                             
modified CHANGELOG.txt
modified UPGRADE.txt
modified install.php
modified includes/actions.inc
modified includes/bootstrap.inc
modified includes/common.inc
modified includes/database.pgsql.inc
modified includes/file.inc
modified includes/form.inc
modified includes/language.inc
modified includes/locale.inc
modified includes/lock.inc
modified includes/mail.inc
modified includes/path.inc
modified includes/xmlrpc.inc
modified includes/xmlrpcs.inc
modified modules/aggregator/aggregator.info                                    
modified modules/aggregator/aggregator.module
modified modules/block/block.info
modified modules/blog/blog.info
modified modules/blogapi/blogapi.info
modified modules/book/book.info
modified modules/color/color.info
modified modules/comment/comment.info
modified modules/comment/comment.module
modified modules/contact/contact.info
modified modules/dblog/dblog.info
modified modules/filter/filter.info
modified modules/filter/filter.module
modified modules/forum/forum.info
modified modules/help/help.info
modified modules/locale/locale.info
modified modules/menu/menu.admin.inc
modified modules/menu/menu.info
modified modules/node/node.info
modified modules/node/node.module
modified modules/openid/openid.info
modified modules/path/path.info
modified modules/php/php.info
modified modules/ping/ping.info
modified modules/poll/poll.info
modified modules/poll/poll.module
modified modules/profile/profile.info
modified modules/search/search.info
modified modules/search/search.module
modified modules/statistics/statistics.admin.inc
modified modules/statistics/statistics.info
modified modules/statistics/statistics.module
modified modules/syslog/syslog.info
modified modules/system/system.info
modified modules/system/system.install
modified modules/system/system.module
modified modules/taxonomy/taxonomy.admin.inc
modified modules/taxonomy/taxonomy.info
modified modules/taxonomy/taxonomy.module
modified modules/throttle/throttle.info
modified modules/tracker/tracker.info
modified modules/translation/translation.info
modified modules/trigger/trigger.info
modified modules/update/update.compare.inc
modified modules/update/update.info
modified modules/update/update.install
modified modules/upload/upload.info
modified modules/upload/upload.module
modified modules/user/user.info
modified modules/user/user.module
modified modules/user/user.pages.inc
modified themes/bluemarine/bluemarine.info                                     
modified themes/chameleon/chameleon.info
modified themes/chameleon/marvin/marvin.info
modified themes/engines/phptemplate/phptemplate.engine
modified themes/garland/garland.info
modified themes/garland/template.php
modified themes/garland/minnelli/minnelli.info
modified themes/pushbutton/pushbutton.info
aborting commit write group: BzrCommandError(empty commit message specified)
bzr: ERROR: empty commit message specified
root@ubuntu:/mnt/apci/main/www# bzr commit '6.17 update'
bzr: ERROR: Path(s) are not versioned: "6.17 update"
root@ubuntu:/mnt/apci/main/www# bzr commit -m '6.17 update'
Committing to: /mnt/apci/main/www/                                             
modified CHANGELOG.txt
modified UPGRADE.txt
modified install.php
modified includes/actions.inc
modified includes/bootstrap.inc
modified includes/common.inc
modified includes/database.pgsql.inc
modified includes/file.inc
modified includes/form.inc
modified includes/language.inc
modified includes/locale.inc
modified includes/lock.inc
modified includes/mail.inc
modified includes/path.inc
modified includes/xmlrpc.inc
modified includes/xmlrpcs.inc
modified modules/aggregator/aggregator.info
modified modules/aggregator/aggregator.module
modified modules/block/block.info
modified modules/blog/blog.info
modified modules/blogapi/blogapi.info
modified modules/book/book.info
modified modules/color/color.info
modified modules/comment/comment.info
modified modules/comment/comment.module
modified modules/contact/contact.info
modified modules/dblog/dblog.info
modified modules/filter/filter.info
modified modules/filter/filter.module
modified modules/forum/forum.info
modified modules/help/help.info
modified modules/locale/locale.info
modified modules/menu/menu.admin.inc
modified modules/menu/menu.info
modified modules/node/node.info
modified modules/node/node.module
modified modules/openid/openid.info
modified modules/path/path.info
modified modules/php/php.info
modified modules/ping/ping.info
modified modules/poll/poll.info
modified modules/poll/poll.module
modified modules/profile/profile.info
modified modules/search/search.info
modified modules/search/search.module
modified modules/statistics/statistics.admin.inc                               
modified modules/statistics/statistics.info
modified modules/statistics/statistics.module
modified modules/syslog/syslog.info
modified modules/system/system.info
modified modules/system/system.install
modified modules/system/system.module
modified modules/taxonomy/taxonomy.admin.inc
modified modules/taxonomy/taxonomy.info
modified modules/taxonomy/taxonomy.module
modified modules/throttle/throttle.info
modified modules/tracker/tracker.info
modified modules/translation/translation.info
modified modules/trigger/trigger.info
modified modules/update/update.compare.inc
modified modules/update/update.info
modified modules/update/update.install
modified modules/upload/upload.info
modified modules/upload/upload.module
modified modules/user/user.info
modified modules/user/user.module
modified modules/user/user.pages.inc
modified themes/bluemarine/bluemarine.info
modified themes/chameleon/chameleon.info
modified themes/chameleon/marvin/marvin.info
modified themes/engines/phptemplate/phptemplate.engine
modified themes/garland/garland.info
modified themes/garland/template.php
modified themes/garland/minnelli/minnelli.info
modified themes/pushbutton/pushbutton.info
Committed revision 84.                                                         
root@ubuntu:/mnt/apci/main/www# bzr status
unknown:
  crossdomain.xml
  file_import.php
  import_files/
  rb.php
  rebuild_mods.php
  rrd/
  sitemap.xml
  includes/image.imagemagick.inc
  modules/loadcache/
  modules/lock/
  scripts/nettest.pl
  sites/scripts/
  sites/all/libraries/
  sites/all/modules/
  sites/all/themes/
  sites/default/backstruct.sh
  sites/default/backup.sh
  sites/default/cacheclear.sql
  sites/default/default_env_settings.php
  sites/default/dev-to-prod.sh
  sites/default/fullbackup.sh
  sites/default/getdev.sh
  sites/default/global_app_settings.php
  sites/default/restore.sh
  sites/default/themes/
root@ubuntu:/mnt/apci/main/www# git status
# On branch pressflow
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	../database-backups/
#	../kaltura-sav/
#	../scripts/201004151616.sql
#	../scripts/junk.php
#	.bzrignore
#	crossdomain.xml
#	rb.php
#	rebuild_mods.php
#	sites/all/modules/contrib/admin.old/
#	sites/all/modules/contrib/bracket/
#	sites/all/modules/contrib/coder/
#	sites/all/modules/contrib/deploy/
#	sites/all/modules/contrib/expire/
#	sites/all/modules/contrib/masquerade/822098-use-theme-username.patch
#	sites/all/modules/contrib/masquerade/masquerade_ignore_anonymous_users.diff
#	sites/all/modules/contrib/notifications_extra/
#	sites/all/modules/contrib/path_redirect.old/
#	sites/all/modules/contrib/privatemsg/newpatch
#	sites/all/modules/contrib/privatemsg/privatemsg-grammar-804392-2.patch
#	sites/all/modules/contrib/rules/rules/line-955-comment
#	sites/all/modules/invite-DRUPAL-6--2-0-BETA2/
#	sites/all/modules/invite.junk/
#	sites/all/modules/invite.new/
#	sites/all/modules/invite.old/
#	sites/all/modules/invite/invite.module.orig
#	sites/all/modules/invite/invite.module.rej
#	sites/all/modules/invite/translations/hu.po
#	sites/all/modules/invite/translations/zh-hans.po
#	sites/all/modules/location/CVS/
#	sites/all/modules/location/contrib/CVS/
#	sites/all/modules/location/plugins/
#	sites/scripts/RESTClient.php.global
#	sites/scripts/RESTClient.php.new
#	sites/scripts/RESTClient.php.sav
#	sites/scripts/restrequestincphp1.zip
nothing added to commit but untracked files present (use "git add" to track)
root@ubuntu:/mnt/apci/main/www# bzr merge lp:pressflow
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data.  See "bzr help launchpad-login".
http://bazaar.launchpad.net/%7Epressflow/pressflow/6 is permanently redirected to /~pressflow/pressflow/6/changes
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data.  See "bzr help launchpad-login".
+N  modules/simpletest/simpletest.mail.inc                                     
 M  CHANGELOG.txt
 M  COPYRIGHT.txt
 M  includes/actions.inc
 M  includes/batch.inc
 M  includes/bootstrap.inc
 M  includes/common.inc
 M  includes/database.inc
 M  includes/file.inc
 M  includes/form.inc
 M  includes/locale.inc
 M  includes/menu.inc
 M  includes/unicode.inc
 M  modules/aggregator/aggregator.info
 M  modules/block/block.info
 M  modules/blog/blog.info
 M  modules/blogapi/blogapi.info
 M  modules/book/book.info
 M  modules/book/book.pages.inc
 M  modules/color/color.info
 M  modules/comment/comment.info
 M  modules/comment/comment.module
 M  modules/contact/contact.info
 M  modules/cookie_cache_bypass/cookie_cache_bypass.module
 M  modules/dblog/dblog.info
 M  modules/filter/filter.info
 M  modules/filter/filter.module
 M  modules/forum/forum.info
 M  modules/help/help.info
 M  modules/locale/locale.info
 M  modules/menu/menu.info
 M  modules/node/node.info
 M  modules/node/node.module
 M  modules/openid/openid.info
 M  modules/openid/openid.install
 M  modules/openid/openid.module
 M  modules/path/path.info
 M  modules/path_alias_cache/path_alias_cache.module
 M  modules/php/php.info
 M  modules/ping/ping.info
 M  modules/poll/poll.info
 M  modules/profile/profile.info
 M  modules/search/search.info
 M  modules/search/search.module
 M  modules/simpletest/CHANGELOG.txt
 M  modules/simpletest/INSTALL.txt
 M  modules/simpletest/drupal_web_test_case.php
 M  modules/simpletest/run-tests.sh
 M  modules/simpletest/simpletest.info
 M  modules/simpletest/simpletest.install
 M  modules/simpletest/simpletest.js
 M  modules/simpletest/simpletest.module
 M  modules/simpletest/simpletest.pages.inc
 M  modules/simpletest/simpletest.test
 M  modules/statistics/statistics.info
 M  modules/syslog/syslog.info
 M  modules/system/page.tpl.php
 M  modules/system/system.info
 M  modules/system/system.install
 M  modules/system/system.module
 M  modules/taxonomy/taxonomy.info
 M  modules/taxonomy/taxonomy.module
 M  modules/throttle/throttle.info
 M  modules/tracker/tracker.info
 M  modules/translation/translation.info
 M  modules/trigger/trigger.admin.inc
 M  modules/trigger/trigger.info
 M  modules/trigger/trigger.module
 M  modules/update/update.info
 M  modules/upload/upload.info
 M  modules/upload/upload.module
 M  modules/user/user.info
 M  modules/user/user.module
 M  modules/user/user.pages.inc
 M  sites/default/default.settings.php
 M  themes/bluemarine/bluemarine.info
 M  themes/chameleon/chameleon.info
 M  themes/chameleon/marvin/marvin.info
 M  themes/garland/garland.info
 M  themes/garland/minnelli/minnelli.info
 M  themes/garland/print.css
 M  themes/pushbutton/pushbutton.info
Text conflict in modules/user/user.module
1 conflicts encountered.                                                       
root@ubuntu:/mnt/apci/main/www#