Merge lp:~jameinel/bzr/2.6-merges-2.5 into lp:bzr
Proposed by
John A Meinel
Status: | Merged |
---|---|
Approved by: | Martin Packman |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6579 |
Proposed branch: | lp:~jameinel/bzr/2.6-merges-2.5 |
Merge into: | lp:bzr |
Diff against target: |
200 lines (+82/-19) 5 files modified
bzrlib/dirstate.py (+12/-3) bzrlib/tests/blackbox/test_uncommit.py (+17/-0) bzrlib/tests/per_workingtree/test_parents.py (+18/-3) bzrlib/tests/test_dirstate.py (+14/-2) doc/en/release-notes/bzr-2.4.txt (+21/-11) |
To merge this branch: | bzr merge lp:~jameinel/bzr/2.6-merges-2.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
bzr-core | Pending | ||
Review via email: mp+171068@code.launchpad.net |
Commit message
Merge bzr/2.5 into trunk, including the fix for bug #855155
Description of the change
Just merging 2.5 into trunk.
To post a comment you must log in.
sent to pqm by email