lp:~bilalakhtar/bzr-builddeb/add-natty
- Get this branch:
- bzr branch lp:~bilalakhtar/bzr-builddeb/add-natty
Branch merges
- Jelmer Vernooij: Approve
-
Diff: 10 lines (+1/-1)1 file modifiedutil.py (+1/-1)
Related source package recipes
Related bugs
| Bug #668764: Add Natty to the list of known distros | High | Fix Released |
|
Related blueprints
Branch information
Recent revisions
- 483. By James Westby
-
Also look for renames that happened in the packaging branch.
Renames in the file_ids_from trees can cause issues on merge-upstream,
so look there for them as well, and deal with them in the same way. - 477. By James Westby
-
Split file_ids_from in to one we should take renames from, and others.
Having multiple trees that we may follow renames from led to lots of
bugs, and turned out to be unnecessary.Split file_ids_from to give a single tree that will be authoritative,
and a list of others that we will take file ids from, but only if we would
otherwise generate one. - 476. By James Westby
-
Avoid duplicate file ids in the import code with renames.
Don't crash when doing merge-upstream with a branch that does a rename
and then ships another file with the old path in the tarball that isn't
in the branch.We would assign the same id to both paths, which obviously doesn't work.
Instead we now do a first pass to determine which file ids in the tree
will be assigned to different paths, and then avoid re-using that file
id with the old path.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr-builddeb
