lp:~maxb/bzr-builddeb/mend-indent

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 564

James Westby: Approve on 2011-06-04

Diff: 257 lines (+83/-84)

5 files modified

import_dsc.py (+37/-37)
tests/blackbox/test_import_dsc.py (+3/-4)
tests/test_import_dsc.py (+11/-11)
tests/test_merge_upstream.py (+19/-19)
util.py (+13/-13)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

563. By Max Bowsher on 2011-06-04

Mend inconsistencies where different indent widths are used at different points
within a single Python source file. I've not attempted to produce consistency
across the project, just ensure each file is internally consistent.

562. By Max Bowsher on 2011-06-03

Fix overly permissive determination of whether another branch in a
DistributionBranchSet can be pulled into the current one. This could result in
revisions being removed from an Ubuntu branch to make it identical to a Debian
branch, when importing a synced package version.

561. By Max Bowsher on 2011-05-16

trace.note the cause when an execution of dch fails.

560. By Max Bowsher on 2011-05-16

Adjust the Build-Depends on python-bzrlib.tests to include
| bzr (<< 2.4.0~beta1-2), for documentation and consistency.

559. By Jelmer Vernooij on 2011-05-16

Merge new 'bzr dep3-patch' command.

558. By Jelmer Vernooij on 2011-05-06

releasing version 2.7.4

557. By Jelmer Vernooij on 2011-05-06

Merge fix for check_inventory_shape being removed in newer versions of bzr.

556. By Max Bowsher on 2011-05-05

Add python-bzrlib.tests to Build-Depends-Indep.

555. By Jelmer Vernooij on 2011-04-29

Merge support for running 'bzr merge-upstream' in a branch without packaging metadata.

554. By Jelmer Vernooij on 2011-04-29

Merge support for automatically determining version from tarball names.