Merge lp://staging/~jelmer/bzr-hg/sprout into lp://staging/~launchpad-pqm/bzr-hg/devel
Proposed by
Jelmer Vernooij
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~jelmer/bzr-hg/sprout | ||||
| Merge into: | lp://staging/~launchpad-pqm/bzr-hg/devel | ||||
| Diff against target: |
2260 lines (+1096/-407) 27 files modified
.bzrignore (+1/-0) .testr.conf (+4/-0) HACKING (+1/-3) Makefile (+1/-1) NEWS (+23/-2) __init__.py (+144/-272) branch.py (+131/-11) dir.py (+395/-0) fetch.py (+133/-74) info.py (+4/-3) mapping.py (+11/-4) overlay.py (+1/-1) parsers.py (+33/-0) repository.py (+47/-5) setup.py (+1/-1) tests/__init__.py (+1/-0) tests/test_branch.py (+4/-4) tests/test_dir.py (+13/-6) tests/test_fetch.py (+53/-0) tests/test_mapping.py (+33/-1) tests/test_parsers.py (+12/-1) tests/test_pull.py (+5/-5) tests/test_repository.py (+3/-3) ui.py (+4/-4) util.py (+1/-1) versionedfiles.py (+2/-0) workingtree.py (+35/-5) |
||||
| To merge this branch: | bzr merge lp://staging/~jelmer/bzr-hg/sprout | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Launchpad PQM Bot | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-03-23.
Description of the change
Provide a custom sprout implementation. Fixes compatibility with newer versions of bzr.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
