Merge lp://staging/~mbp/bzr/integration into lp://staging/bzr
Proposed by
Martin Pool
| Status: | Merged |
|---|---|
| Approved by: | Martin Pool |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 6047 |
| Proposed branch: | lp://staging/~mbp/bzr/integration |
| Merge into: | lp://staging/bzr |
| Diff against target: |
643 lines (+314/-35) 18 files modified
bzrlib/config.py (+12/-0) bzrlib/dirstate.py (+38/-26) bzrlib/errors.py (+13/-0) bzrlib/help_topics/en/configuration.txt (+14/-0) bzrlib/index.py (+5/-0) bzrlib/osutils.py (+11/-0) bzrlib/repofmt/pack_repo.py (+14/-4) bzrlib/tests/__init__.py (+23/-0) bzrlib/tests/test_http.py (+66/-0) bzrlib/tests/test_selftest.py (+12/-0) bzrlib/tests/test_transport.py (+19/-0) bzrlib/transport/__init__.py (+25/-1) bzrlib/transport/http/__init__.py (+1/-1) bzrlib/transport/http/response.py (+8/-1) bzrlib/transport/local.py (+1/-2) doc/developers/testing.txt (+17/-0) doc/en/release-notes/bzr-2.3.txt (+3/-0) doc/en/release-notes/bzr-2.4.txt (+32/-0) |
| To merge this branch: | bzr merge lp://staging/~mbp/bzr/integration |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| bzr-core | Pending | ||
|
Review via email:
|
|||
Commit message
merge 2.3 and 2.4 to trunk
Description of the change
merge up 2.3 and 2.4 into trunk
To post a comment you must log in.
Revision history for this message
| Martin Pool (mbp) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
sent to pqm by email