Merge lp://qastaging/~jameinel/bzr/2.5.2-get_file_text-1046284 into lp://qastaging/bzr/2.5
Proposed by
John A Meinel
| Status: | Merged |
|---|---|
| Merged at revision: | 6509 |
| Proposed branch: | lp://qastaging/~jameinel/bzr/2.5.2-get_file_text-1046284 |
| Merge into: | lp://qastaging/bzr/2.5 |
| Diff against target: |
46 lines (+18/-3) 2 files modified
bzrlib/workingtree_4.py (+14/-3) doc/en/release-notes/bzr-2.5.txt (+4/-0) |
| To merge this branch: | bzr merge lp://qastaging/~jameinel/bzr/2.5.2-get_file_text-1046284 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| bzr-core | Pending | ||
|
Review via email:
|
|||
Commit message
Fix bug #1046284. When iterating over iter_files_bytes, we should consume the content iterator before we proceed with the files iterator.
Description of the change
This is a quick fix for bug #1046284. It fixes get_file_text so that it consumes the content iterator before it consumes the outer iterator.
I don't have a specific test for it, because I'm working on bug #1046697 which has a bit bigger scope.
I'll see if I can get that branch up and working quickly for bzr-2.5 before we release bzr-2.5.2, but I don't think we have to block on getting all that working, rather than getting a fix out for users.
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
