lp://staging/~xnox/bzr-builddeb/fix-tar
- Get this branch:
- bzr branch lp://staging/~xnox/bzr-builddeb/fix-tar
Branch merges
- Bzr-builddeb-hackers: Pending requested
-
Diff: 12 lines (+1/-1)1 file modifiedimport_dsc.py (+1/-1)
Related source package recipes
Related bugs
Related blueprints
Branch information
Recent revisions
- 393. By James Westby
-
Fix a thinko that caused merge-upstream problem.
When previous_version is not defined we shouldn't try and use it, so
move it in to the already extant if block. Thanks Robert. - 391. By James Westby
-
Fix the encoding issues around things taken from the changelog.
Revision properties have to be unicode, we were passing strings, so
it decoded them to unicode using 'ascii', which fails for some strings.
We know they should be utf-8, and we were decoding anyway, so we just
stop re-encoding (and a couple of other tweaks). - 390. By James Westby
-
Ensure that the merged upstream revisions end up in the target branch.
During merge-upstream we may commit a new revision in a temporary branch.
If you do this outside a shared repo then the new revision has ghost parents
in the target branch, which leads to many issues, e.g. bug 493462. - 389. By James Westby
-
Compare the upstream versions as Versions in merge-package.
Comparing them as strings means that the wrong one is picked as the
newer in merge-package where they diverge. This leads to mis-merges.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/bzr-builddeb
