Merge lp:~slyguy/bzr/bug-855155 into lp:bzr
Proposed by
Brian de Alwis
Status: | Rejected |
---|---|
Rejected by: | Richard Wilbur |
Proposed branch: | lp:~slyguy/bzr/bug-855155 |
Merge into: | lp:bzr |
Diff against target: |
50 lines (+29/-3) 2 files modified
bzrlib/dirstate.py (+12/-3) bzrlib/tests/blackbox/test_uncommit.py (+17/-0) |
To merge this branch: | bzr merge lp:~slyguy/bzr/bug-855155 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Richard Wilbur | superceded | Disapprove | |
Review via email: mp+165929@code.launchpad.net |
Description of the change
Bug fix with test for bug 855155.
To post a comment you must log in.
Unmerged revisions
- 6580. By Brian de Alwis
-
Add test for bug 855155 (comment 26)
- 6579. By Brian de Alwis
-
Fix DirState.
_update_ basis_apply_ adds() to handle adds to empty directories
Nice to get a fix for one of the corner cases that turned out to plague a number of people. Thank you for fixing the design oversight that brought us bug 855155. That does look like an interesting one to write a test for!
+1