[Pkg-bazaar-commits] r188 ./bzr-builddeb/trunk: Merge development work.
James Westby
jw+debian at jameswestby.net
Wed Oct 31 16:23:40 UTC 2007
------------------------------------------------------------
revno: 188
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Wed 2007-10-31 16:23:40 +0000
message:
Merge development work.
added:
tests/blackbox/test_import_dsc.py
modified:
TODO
__init__.py
builder.py
changes.py
config.py
debian/changelog
doc/user_manual/native.rst
doc/user_manual/normal.rst
doc/user_manual/upstream_tarballs.rst
errors.py
hooks.py
import_dsc.py
merge_upstream.py
properties.py
repack_tarball.py
setup.py
specs/import-dsc
tests/__init__.py
tests/blackbox/__init__.py
tests/blackbox/test_builddeb.py
tests/blackbox/test_do.py
tests/blackbox/test_merge_upstream.py
tests/test_builder.py
tests/test_config.py
tests/test_hooks.py
tests/test_import_dsc.py
tests/test_merge_upstream.py
tests/test_repack_tarball.py
tests/test_repack_tarball_extra.py
tests/test_util.py
tests/test_version.py
util.py
version.py
------------------------------------------------------------
revno: 178.1.23
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Sun 2007-09-30 10:48:08 +0100
message:
Add a couple of tests for import-dsc.
added:
tests/blackbox/test_import_dsc.py
modified:
tests/blackbox/__init__.py
------------------------------------------------------------
revno: 178.1.24
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Sun 2007-09-30 10:53:38 +0100
message:
Merge from trunk.
added:
tests/blackbox/test_merge_upstream.py
version.py
modified:
__init__.py
debian/changelog
debian/control
specs/do-command
specs/hooks
tests/blackbox/__init__.py
tests/test_version.py
------------------------------------------------------------
revno: 178.1.25
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Sun 2007-09-30 10:55:11 +0100
message:
Update the version_info for 0.92.
modified:
version.py
------------------------------------------------------------
revno: 178.1.26
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Sun 2007-09-30 11:00:54 +0100
message:
Small formatting fix.
modified:
__init__.py
------------------------------------------------------------
revno: 178.1.27
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Sat 2007-10-27 11:35:23 +0100
message:
Merge from trunk.
modified:
README
debian/changelog
doc/user_manual/building.rst
doc/user_manual/configuration.rst
doc/user_manual/export_upstream.rst
doc/user_manual/merge.rst
doc/user_manual/native.rst
doc/user_manual/normal.rst
doc/user_manual/split.rst
doc/user_manual/upstream_tarballs.rst
------------------------------------------------------------
revno: 178.1.28
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Sat 2007-10-27 15:24:29 +0100
message:
Drop the debugging statement.
modified:
tests/blackbox/test_import_dsc.py
------------------------------------------------------------
revno: 178.1.29
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Mon 2007-10-29 18:00:52 +0000
message:
Add support for incremental import dsc.
Incremental means that you can take a source package from an upload that was
made outside the VCS and import it. This is useful for NMUs, or for Ubuntu
merging from Debian.
It is not hooked up to the command yet.
modified:
TODO
__init__.py
builder.py
changes.py
config.py
errors.py
hooks.py
import_dsc.py
merge_upstream.py
properties.py
repack_tarball.py
setup.py
specs/import-dsc
tests/__init__.py
tests/blackbox/__init__.py
tests/blackbox/test_builddeb.py
tests/blackbox/test_do.py
tests/blackbox/test_import_dsc.py
tests/blackbox/test_merge_upstream.py
tests/test_builder.py
tests/test_config.py
tests/test_hooks.py
tests/test_import_dsc.py
tests/test_merge_upstream.py
tests/test_repack_tarball.py
tests/test_repack_tarball_extra.py
tests/test_util.py
tests/test_version.py
util.py
version.py
------------------------------------------------------------
revno: 178.1.30
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Mon 2007-10-29 21:17:57 +0000
message:
Hook up the import-dsc command to allow incremental imports.
Currently imports of native packages are unsupported. Also the results of
importing on to a native package are undefined at this point.
The tree is required to be clean before the operation starts, as the process
would lose information otherwise.
modified:
__init__.py
doc/user_manual/normal.rst
import_dsc.py
tests/blackbox/test_import_dsc.py
tests/test_import_dsc.py
------------------------------------------------------------
revno: 178.1.31
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Mon 2007-10-29 22:04:19 +0000
message:
The --initial option is now required for initial imports with import-dsc.
Trying to guess when to do/allow initial imports was too ambiguous, so
require this flag now. I'm not sure whether initial or incremental will be
more used, so I just went for this option.
modified:
__init__.py
debian/changelog
doc/user_manual/native.rst
doc/user_manual/normal.rst
tests/blackbox/test_import_dsc.py
------------------------------------------------------------
revno: 178.1.32
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Mon 2007-10-29 22:16:30 +0000
message:
Correct the incremental import bug just introduced.
modified:
__init__.py
------------------------------------------------------------
revno: 178.1.33
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Tue 2007-10-30 14:34:51 +0000
message:
Look for the upstream tarball in the archives.
modified:
builder.py
debian/changelog
------------------------------------------------------------
revno: 178.1.34
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Tue 2007-10-30 19:21:45 +0000
message:
Document that apt is used in trying to find the upstream tarball.
modified:
doc/user_manual/upstream_tarballs.rst
------------------------------------------------------------
revno: 178.1.35
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Tue 2007-10-30 21:01:14 +0000
message:
* Filter out any changes to .bzr in packages that are being imported as they
will totally mess things up. If the branch is in the source package then
just use apt-get source. (LP: #156003)
modified:
debian/changelog
import_dsc.py
tests/test_import_dsc.py
-------------- next part --------------
Diff too large for email (1428 lines, the limit is 1000).
More information about the Pkg-bazaar-commits
mailing list