Merge lp:~lifeless/bzr/update into lp:bzr
Proposed by
Robert Collins
Status: | Merged |
---|---|
Approved by: | John A Meinel |
Approved revision: | no longer in the source branch. |
Merged at revision: | not available |
Proposed branch: | lp:~lifeless/bzr/update |
Merge into: | lp:bzr |
Diff against target: |
80 lines (+47/-1) 3 files modified
NEWS (+4/-0) bzrlib/builtins.py (+2/-1) bzrlib/tests/blackbox/test_update.py (+41/-0) |
To merge this branch: | bzr merge lp:~lifeless/bzr/update |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Approve | ||
Review via email: mp+23372@code.launchpad.net |
Commit message
(robertc) Do not warn when updating if a pending merge was merged into trunk. (Robert Collins, bug 562079)
Description of the change
This should go into 2.2 I think. I had thought it was a regression, but its not, however a partial fix is very simple - attached. A more comprehensive fix would need changed apis or history analysis, neither of which is worth it at the moment, I think.
To post a comment you must log in.
Looks good. Doesn't seem like this would be a regression, but it is a positive improvement.