- Committer: Bazaar Package Importer
- Date: 2009-07-26 18:38:47 UTC
- Revision ID: james.westby@ubuntu.com-20090726183847-4qjh3ktbpc1jubzg
[ Jelmer Vernooij ]
* Automatically use merge mode if there's only a debian/ directory in
the packaging branch. Closes: #529816.
[ James Westby ]
* Merge merge-package command from Muharem Hrnjadovic to allow merging
another branch of the same package in a way that will avoid spurious
conflicts from divergent upstream histories. Thanks Muharem.
* Don't crash on merge-upstream due to API changes not being fully applied.
* Add plugin information as parsed by "bzr plugin-info".
* Improve the error when the upstream tag is missing during merge-upstream.
* Also query the config file for the revision to use in export-upstream
(LP: #415572)
* Don't populate the commit message editor with all lines added to
debian/changelog. Only use the stripped version of the "change" lines.
* Always use the date from debian/changelog during import-dsc. Thanks
Sveinung Kvilhaugsvik.
* pristine-tar errors are no longer fatal for building the package.
Thanks Muharem. (LP: #417153)
* Refuse to build a conflicted tree. Thanks Muharem. (LP: #381303)
* Don't crash if there are no deb-src lines when building. (LP: #375897)
* Make import-dsc work against redirected URIs. Thanks Muharem (LP: #337209)
* Automatically use merge mode if there's only a debian/ directory in
the packaging branch. Closes: #529816.
[ James Westby ]
* Merge merge-package command from Muharem Hrnjadovic to allow merging
another branch of the same package in a way that will avoid spurious
conflicts from divergent upstream histories. Thanks Muharem.
* Don't crash on merge-upstream due to API changes not being fully applied.
* Add plugin information as parsed by "bzr plugin-info".
* Improve the error when the upstream tag is missing during merge-upstream.
* Also query the config file for the revision to use in export-upstream
(LP: #415572)
* Don't populate the commit message editor with all lines added to
debian/changelog. Only use the stripped version of the "change" lines.
* Always use the date from debian/changelog during import-dsc. Thanks
Sveinung Kvilhaugsvik.
* pristine-tar errors are no longer fatal for building the package.
Thanks Muharem. (LP: #417153)
* Refuse to build a conflicted tree. Thanks Muharem. (LP: #381303)
* Don't crash if there are no deb-src lines when building. (LP: #375897)
* Make import-dsc work against redirected URIs. Thanks Muharem (LP: #337209)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
.bzr-builddeb
|
1 | 17 years ago | Bazaar Package Importer | * upload to feisty * bump depends on bzr on (>= 0. |
|
||
|
debian
|
1 | 17 years ago | Bazaar Package Importer | * upload to feisty * bump depends on bzr on (>= 0. |
|
||
|
doc
|
4.1.4 | 16 years ago | Bazaar Package Importer | * Medium urgency as it will hold up the bzr 0.18 t |
|
||
|
specs
|
4 | 17 years ago | Bazaar Package Importer | * Version designed to work with bzr 0.15. * Bump |
|
||
|
tests
|
4.1.2 | 16 years ago | Bazaar Package Importer | fakesync as just discussed on #ubuntu-devel |
|
||
__init__.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 4.6 KB |
|
|
|
builder.py |
9 | 14 years ago | Bazaar Package Importer | * Don't cause the commit to fail if the changelog | 3.3 KB |
|
|
|
bzr-builddeb_0.1-1_i386.changes |
1 | 17 years ago | Bazaar Package Importer | * upload to feisty * bump depends on bzr on (>= 0. | 702 bytes |
|
|
|
bzr-buildpackage |
1 | 17 years ago | Bazaar Package Importer | * upload to feisty * bump depends on bzr on (>= 0. | 1 KB |
|
|
|
bzr-buildpackage.1 |
4 | 17 years ago | Bazaar Package Importer | * Version designed to work with bzr 0.15. * Bump | 524 bytes |
|
|
|
changes.py |
8 | 15 years ago | Bazaar Package Importer | [ James Westby ] * Don't remove the debian part of | 2.3 KB |
|
|
|
cmds.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 39.2 KB |
|
|
|
config.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 9.5 KB |
|
|
|
COPYING |
1 | 17 years ago | Bazaar Package Importer | * upload to feisty * bump depends on bzr on (>= 0. | 17.5 KB |
|
|
|
default.conf |
2 | 17 years ago | Bazaar Package Importer | revert the smart options patch so that the package | 101 bytes |
|
|
|
directory.py |
8 | 15 years ago | Bazaar Package Importer | [ James Westby ] * Don't remove the debian part of | 3.5 KB |
|
|
|
errors.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 5.7 KB |
|
|
|
hooks.py |
5 | 16 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] Support building from remote b | 1.3 KB |
|
|
|
import_dsc.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 73.3 KB |
|
|
|
info.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 1 KB |
|
|
|
info.pyc |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 414 bytes |
|
|
|
launchpad.py |
8 | 15 years ago | Bazaar Package Importer | [ James Westby ] * Don't remove the debian part of | 2.4 KB |
|
|
|
local.conf |
4.1.15 | 15 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Add simple deb: directory se | 34 bytes |
|
|
|
merge_package.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 6.9 KB |
|
|
|
merge_upstream.py |
8 | 15 years ago | Bazaar Package Importer | [ James Westby ] * Don't remove the debian part of | 6.7 KB |
|
|
|
properties.py |
4.1.11 | 15 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Support +bzr for snapshots a | 1.9 KB |
|
|
|
README |
4.1.16 | 15 years ago | Bazaar Package Importer | * Merge the tags from the upstream branch when doi | 13.7 KB |
|
|
|
repack_tarball.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 7.5 KB |
|
|
|
revspec.py |
4.1.16 | 15 years ago | Bazaar Package Importer | * Merge the tags from the upstream branch when doi | 1.8 KB |
|
|
|
setup.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 1.6 KB |
|
|
|
source_distiller.py |
8 | 15 years ago | Bazaar Package Importer | [ James Westby ] * Don't remove the debian part of | 6.2 KB |
|
|
|
TODO |
4.1.15 | 15 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Add simple deb: directory se | 598 bytes |
|
|
|
upstream.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 17.1 KB |
|
|
|
user.conf |
4.1.15 | 15 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Add simple deb: directory se | 55 bytes |
|
|
|
util.py |
10 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Automatically use merge mode | 16.2 KB |
|
|
|
version.py |
7 | 15 years ago | Bazaar Package Importer | * Add --download-version to the uscan command line | 1.3 KB |
|
|