builddeb breaks if previous upload was to non-release pocket

.bzrignore (+1/-0)
debian/changelog (+3/-1)
tests/test_util.py (+5/-0)
util.py (+2/-2)

.bzrignore (+1/-0)
.testr.conf (+4/-0)
README (+4/-6)
__init__.py (+78/-23)
builder.py (+6/-13)
bzrtools_bzrtools.py (+30/-0)
bzrtools_import.py (+409/-0)
changes.py (+10/-6)
cmds.py (+595/-306)
config.py (+24/-1)
debian/changelog (+190/-3)
debian/control (+8/-9)
debian/doc-base (+1/-2)
dh_make.py (+128/-0)
directory.py (+19/-9)
doc/user_manual/normal.rst (+37/-1)
doc/user_manual/upstream_tarballs.rst (+3/-1)
errors.py (+46/-1)
hooks.py (+2/-2)
import_dsc.py (+491/-507)
info.py (+1/-1)
launchpad.py (+6/-5)
merge_changelog.py (+152/-0)
merge_package.py (+183/-0)
merge_upstream.py (+103/-27)
repack_tarball.py (+32/-26)
source_distiller.py (+4/-11)
tagging.py (+75/-0)
tests/__init__.py (+56/-32)
tests/blackbox/__init__.py (+3/-2)
tests/blackbox/test_builddeb.py (+35/-14)
tests/blackbox/test_do.py (+11/-4)
tests/blackbox/test_import_dsc.py (+40/-18)
tests/blackbox/test_import_upstream.py (+149/-0)
tests/blackbox/test_mark_uploaded.py (+7/-3)
tests/blackbox/test_merge_package.py (+207/-0)
tests/blackbox/test_merge_upstream.py (+143/-5)
tests/test_bzrtools_import.py (+175/-0)
tests/test_config.py (+7/-1)
tests/test_dh_make.py (+58/-0)
tests/test_import_dsc.py (+567/-41)
tests/test_merge_changelog.py (+252/-0)
tests/test_merge_package.py (+650/-0)
tests/test_merge_upstream.py (+37/-19)
tests/test_repack_tarball_extra.py (+21/-0)
tests/test_source_distiller.py (+5/-1)
tests/test_tagging.py (+62/-0)
tests/test_upstream.py (+6/-18)
tests/test_util.py (+251/-12)
upstream.py (+148/-111)
util.py (+342/-54)