Merge lp://staging/~spiv/loggerhead/diff-of-r1 into lp://staging/loggerhead
Proposed by
Andrew Bennetts
| Status: | Merged |
|---|---|
| Merged at revision: | 452 |
| Proposed branch: | lp://staging/~spiv/loggerhead/diff-of-r1 |
| Merge into: | lp://staging/loggerhead |
| Diff against target: |
42 lines (+5/-3) 2 files modified
loggerhead/controllers/diff_ui.py (+4/-2) loggerhead/templates/revision.pt (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~spiv/loggerhead/diff-of-r1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Loggerhead Reviewers | Pending | ||
|
Review via email:
|
|||
Commit message
Fix /diff/1
Description of the change
This fixes /diff/1. i.e. if a revision has no left-hand parent then use NULL_REVISION instead.
This also reenables the 'download diff' link in this situation too, which had been suppressed, presumably to workaround this limitation.
To post a comment you must log in.
Revision history for this message
| John A Meinel (jameinel) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Merge: approve
=:->
On Jun 28, 2011 5:53 PM, "Andrew Bennetts" <email address hidden>
wrote:
> Andrew Bennetts has proposed merging lp:~spiv/loggerhead/diff-of-r1 into
lp:loggerhead.
>
> Requested reviews:
> Loggerhead Reviewers (loggerhead-
>
> For more details, see:
> https:/
>
> This fixes /diff/1. i.e. if a revision has no left-hand parent then use
NULL_REVISION instead.
>
> This also reenables the 'download diff' link in this situation too, which
had been suppressed, presumably to workaround this limitation.
> --
> https:/
> You are subscribed to branch lp:loggerhead.