swift-debian broken since build #104

Build #104 console output is:

Started by upstream project "swift" build number 135
Building on master
$ bzr revision-info -d /var/lib/hudson/jobs/swift-debian/workspace
[workspace] $ bzr pull --overwrite lp:swift/debian
No revisions to pull.
$ bzr revision-info -d /var/lib/hudson/jobs/swift-debian/workspace
[workspace] $ bzr log -v -r revid:<email address hidden>:<email address hidden> --long --show-ids
Getting local revision...
$ bzr revision-info -d /var/lib/hudson/jobs/swift-debian/workspace
<email address hidden>
[workspace] $ /bin/sh -xe /tmp/hudson3752974851970187107.sh
+ bzr merge lp:swift
 M bin/st
 M bin/swift-account-audit
 M bin/swift-auth-add-user
 M bin/swift-auth-recreate-accounts
 M bin/swift-auth-update-reseller-prefixes
 M bin/swift-bench
 M bin/swift-drive-audit
 M bin/swift-get-nodes
 M bin/swift-log-uploader
 M bin/swift-object-info
 M bin/swift-ring-builder
 M bin/swift-stats-populate
 M bin/swift-stats-report
 M swift/__init__.py
 M swift/common/daemon.py
 M swift/common/wsgi.py
 M test/unit/container/test_updater.py
Text conflict in swift/__init__.py
1 conflicts encountered.
Finished: FAILURE

which then resulted in the following build failures:

Started by upstream project "swift" build number 136
Building on master
$ bzr revision-info -d /var/lib/hudson/jobs/swift-debian/workspace
[workspace] $ bzr pull --overwrite lp:swift/debian
No revisions to pull.
$ bzr revision-info -d /var/lib/hudson/jobs/swift-debian/workspace
[workspace] $ bzr log -v -r revid:<email address hidden>:<email address hidden> --long --show-ids
Getting local revision...
$ bzr revision-info -d /var/lib/hudson/jobs/swift-debian/workspace
<email address hidden>
[workspace] $ /bin/sh -xe /tmp/hudson8111695973116792432.sh
+ bzr merge lp:swift
bzr: ERROR: Working tree "/var/lib/hudson/jobs/swift-debian/workspace/" has uncommitted changes (See bzr status).
Finished: FAILURE