Merge lp:~cjwatson/bzr/fix-keep-dirty into lp:bzr
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6605 |
Proposed branch: | lp:~cjwatson/bzr/fix-keep-dirty |
Merge into: | lp:bzr |
Diff against target: |
46 lines (+17/-1) 2 files modified
bzrlib/patches.py (+8/-0) bzrlib/tests/test_patches.py (+9/-1) |
To merge this branch: | bzr merge lp:~cjwatson/bzr/fix-keep-dirty |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
William Grant | Approve | ||
Review via email: mp+263632@code.launchpad.net |
Commit message
Avoid associating dirty patch headers with the previous file in the patch.
Description of the change
The keep_dirty feature added in https:/
To fix this, when we encounter a "===" line, check whether there are any saved lines and if so emit them at that point before continuing.
I extended the existing tests slightly to cover this (./bzr selftest -v -s bt.test_patches), and haven't bothered adding a release note since this is a bug-fix to a change that as yet hasn't been part of a bzr release.
Thanks for fixing that.
Just a minor nit if you don't mind ;) see inline comments.
Good to land otherwise.