Merge lp://qastaging/bzr-hg into lp://qastaging/~launchpad-pqm/bzr-hg/devel

Proposed by Aaron Bentley
Status: Merged
Merged at revision: 282
Proposed branch: lp://qastaging/bzr-hg
Merge into: lp://qastaging/~launchpad-pqm/bzr-hg/devel
Diff against target: 729 lines (+257/-65)
17 files modified
Makefile (+3/-11)
NEWS (+21/-1)
README (+12/-0)
__init__.py (+48/-7)
branch.py (+19/-10)
commands.py (+55/-0)
fetch.py (+6/-4)
idmap.py (+2/-2)
info.py (+2/-2)
mapping.py (+8/-4)
parsers.py (+8/-5)
repository.py (+6/-1)
setup.py (+1/-1)
tests/__init__.py (+9/-2)
tests/test_dir.py (+42/-0)
tests/test_mapping.py (+1/-1)
tests/test_parsers.py (+14/-14)
To merge this branch: bzr merge lp://qastaging/bzr-hg
Reviewer Review Type Date Requested Status
Launchpad code reviewers from Canonical Pending
Review via email: mp+31876@code.qastaging.launchpad.net

Commit message

Update to branch tip for bzr 2.2 compatibility

Description of the change

Update to trunk tip for compatibility with bzr 2.2

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches