Merge lp:~cjwatson/bzr/fix-keep-dirty into lp:bzr
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil on 2015-07-02 |
Approved revision: | 6605 |
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 on 2015-07-02 | ||
William Grant | 2015-07-02 | Approve on 2015-07-02 | |
Review via email:
|
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.
- 6605. By Colin Watson on 2015-07-02
-
Use assertLength.
Vincent Ladeuil (vila) wrote : | # |
sent to pqm by email
Vincent Ladeuil (vila) wrote : | # |
sent to pqm by email
Vincent Ladeuil (vila) wrote : | # |
sent to pqm by email
Richard Wilbur (richard-wilbur) wrote : | # |
I have an open rt ticket with ubuntu.com regarding pqm. I am bugging them again about it because they said they found an issue 10 days ago and would get back to me when they had it resolved.
(By the way, thanks Colin for the fix. And thanks Vincent and William for participating in the review process.)
Richard Wilbur (richard-wilbur) wrote : | # |
The open rt ticket regarding pqm is #26672 at ubuntu.com.
Vincent Ladeuil (vila) wrote : | # |
sent to pqm by email
Thanks for fixing that.
Just a minor nit if you don't mind ;) see inline comments.
Good to land otherwise.