lp:~vila/bzr-builddeb/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

James Westby: Approve on 2009-07-15

Diff: None lines api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

346. By Vincent Ladeuil on 2009-07-10

Bis repetitas placent :)

* tests/test_import_dsc.py:
(DistributionBranchTests.test_import_package_init_upstream_from_other,
DistributionBranchTests.test_merge_upstream_branches,
DistributionBranchTests.test_import_symlink): More
PristineTarFeature uses.

345. By James Westby on 2009-07-04

Merge from trunk.

344. By James Westby on 2009-07-04

Fix import-dsc when there is a symlink.

Also add the workaround for exporting working trees when grabbing the
pristine-tar information during import-dsc.

343. By James Westby on 2009-07-04

Also use the upstream revision to get file ids from.

342. By James Westby on 2009-07-04

Fix recreating tarball with pristine-tar.

341. By James Westby on 2009-07-04

Add karmic.

340. By James Westby on 2009-06-09

Merge some more fixes.

339. By James Westby on 2009-06-08

Remove the rename_map stuff, as it won't work currently.

The way we import means that there aren't any unversioned files, so
rename_map won't do anything. We need to change the import logic to do
this correctly.

338. By James Westby on 2009-06-08

Merge 2.1 fixes.

337. By James Westby on 2009-06-08

Use guess_renames to automatically guess renames that have been done on import