Merge lp://staging/~jelmer/brz/mainline-ghosts into lp://staging/brz
Proposed by
Jelmer Vernooij
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Jelmer Vernooij | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merge reported by: | The Breezy Bot | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~jelmer/brz/mainline-ghosts | ||||
| Merge into: | lp://staging/brz | ||||
| Prerequisite: | lp://staging/~jelmer/brz/iter-revisions | ||||
| Diff against target: |
156 lines (+52/-25) 3 files modified
breezy/log.py (+44/-22) breezy/tests/blackbox/test_log.py (+5/-3) doc/en/release-notes/brz-3.0.txt (+3/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~jelmer/brz/mainline-ghosts | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Packman | Approve | ||
|
Review via email:
|
|||
Commit message
Cope with ghosts in mainline history in ``bzr log``.
Description of the change
When branch mainline contains a ghost, print revisions up until that point and then an error message.
To post a comment you must log in.
Revision history for this message
| Jelmer Vernooij (jelmer) | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Changes seem fine with some nit notes inline.