- Committer: Bazaar Package Importer
- Date: 2011-07-26 15:10:18 UTC
- Revision ID: james.westby@ubuntu.com-20110726151018-9oj3pru5b29q4k76
[ Jelmer Vernooij ]
* Build type now defaults to normal mode when used in an empty tree.
LP: #776528
[ Andrew Bennetts ]
* Use dpkg-mergechangelogs(1) to merge changelog files.
+ Preserve the existing ordering of changelog entries when merging.
LP: #718944
+ Additional changelog entries are modified when merging another branch.
LP: #552950
+ 3-way changelog file merge doesn't do textual merging on sections.
LP: #517093
+ 3-way changelog file merge doesn't support deletions. LP: #517090
[ Jelmer Vernooij ]
* Add python-lzma to build dependencies, for use in test suite.
* Recommend libalgorithm-merge-perl, required for conflict resolution
in dpkg-mergechangelogs.
* Build type now defaults to normal mode when used in an empty tree.
LP: #776528
[ Andrew Bennetts ]
* Use dpkg-mergechangelogs(1) to merge changelog files.
+ Preserve the existing ordering of changelog entries when merging.
LP: #718944
+ Additional changelog entries are modified when merging another branch.
LP: #552950
+ 3-way changelog file merge doesn't do textual merging on sections.
LP: #517093
+ 3-way changelog file merge doesn't support deletions. LP: #517090
[ Jelmer Vernooij ]
* Add python-lzma to build dependencies, for use in test suite.
* Recommend libalgorithm-merge-perl, required for conflict resolution
in dpkg-mergechangelogs.
| 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 | 17 years ago | Bazaar Package Importer | fakesync as just discussed on #ubuntu-devel |
|
||
|
upstream
|
13 | 13 years ago | Bazaar Package Importer | [ James Westby ] * Accept None as a valid previou |
|
||
.testr.conf |
11 | 13 years ago | Bazaar Package Importer | [ Colin Watson ] * Consider a .dsc without a Forma | 175 bytes |
|
|
|
__init__.py |
18 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * New 'bzr dep3-patch' subcomm | 8.1 KB |
|
|
|
builder.py |
7 | 14 years ago | Bazaar Package Importer | * Upload to unstable. * Bump standards version to | 3.1 KB |
|
|
|
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 |
|
|
|
bzrtools_bzrtools.py |
8 | 14 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Switch section to vcs. * All | 1.2 KB |
|
|
|
bzrtools_import.py |
13 | 13 years ago | Bazaar Package Importer | [ James Westby ] * Accept None as a valid previou | 14.2 KB |
|
|
|
cmds.py |
20 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Build type now defaults to n | 55.9 KB |
|
|
|
config.py |
13 | 13 years ago | Bazaar Package Importer | [ James Westby ] * Accept None as a valid previou | 9.8 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 |
|
|
|
dep3.py |
18 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * New 'bzr dep3-patch' subcomm | 6.8 KB |
|
|
|
dh_make.py |
18 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * New 'bzr dep3-patch' subcomm | 4.6 KB |
|
|
|
directory.py |
20 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Build type now defaults to n | 3.9 KB |
|
|
|
errors.py |
18 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * New 'bzr dep3-patch' subcomm | 7 KB |
|
|
|
hooks.py |
7 | 14 years ago | Bazaar Package Importer | * Upload to unstable. * Bump standards version to | 1.3 KB |
|
|
|
import_dsc.py |
20 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Build type now defaults to n | 67.9 KB |
|
|
|
info.py |
13 | 13 years ago | Bazaar Package Importer | [ James Westby ] * Accept None as a valid previou | 1 KB |
|
|
|
info.pyc |
20 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Build type now defaults to n | 381 bytes |
|
|
|
launchpad.py |
18 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * New 'bzr dep3-patch' subcomm | 4.9 KB |
|
|
|
local.conf |
4.1.15 | 15 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Add simple deb: directory se | 34 bytes |
|
|
|
merge_changelog.py |
20 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Build type now defaults to n | 3.9 KB |
|
|
|
merge_package.py |
18 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * New 'bzr dep3-patch' subcomm | 7.3 KB |
|
|
|
merge_upstream.py |
20 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Build type now defaults to n | 4.1 KB |
|
|
|
properties.py |
4.1.11 | 16 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Support +bzr for snapshots a | 1.9 KB |
|
|
|
README |
20 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Build type now defaults to n | 13.7 KB |
|
|
|
repack_tarball.py |
18 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * New 'bzr dep3-patch' subcomm | 8.4 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 |
15 | 13 years ago | Bazaar Package Importer | [ Andrew Mitchell ] Add upstream/ directory to set | 1.7 KB |
|
|
|
source_distiller.py |
18 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * New 'bzr dep3-patch' subcomm | 5.6 KB |
|
|
|
tagging.py |
18 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * New 'bzr dep3-patch' subcomm | 1.2 KB |
|
|
|
TODO |
4.1.15 | 15 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Add simple deb: directory se | 598 bytes |
|
|
|
user.conf |
4.1.15 | 15 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Add simple deb: directory se | 55 bytes |
|
|
|
util.py |
20 | 12 years ago | Bazaar Package Importer | [ Jelmer Vernooij ] * Build type now defaults to n | 26.2 KB |
|
|
|
version.py |
5.1.2 | 15 years ago | Bazaar Package Importer | * Add --download-version to the uscan command line | 1.3 KB |
|
|