Merge lp://staging/~jugmac00/loggerhead/fix-viewing-large-files into lp://staging/loggerhead

Proposed by Jürgen Gmach
Status: Merged
Approved by: Colin Watson
Approved revision: 522
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp://staging/~jugmac00/loggerhead/fix-viewing-large-files
Merge into: lp://staging/loggerhead
Diff against target: 86 lines (+42/-1)
5 files modified
NEWS (+5/-0)
loggerhead/highlight.py (+1/-1)
loggerhead/tests/__init__.py (+1/-0)
loggerhead/tests/test_highlight.py (+33/-0)
requirements.txt (+2/-0)
To merge this branch: bzr merge lp://staging/~jugmac00/loggerhead/fix-viewing-large-files
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Jelmer Vernooij Approve
Review via email: mp+418309@code.staging.launchpad.net

Commit message

Fix highlighting for large files

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Still LGTM, thanks!

review: Approve
Revision history for this message
Jürgen Gmach (jugmac00) wrote (last edit ):

Thanks Jelmer!

So, now I am stuck. How do I get this merged now?

Is there buildbot involved so it would be enough to mark this MP as "approved"?

If not, I'd appreciate detailed instructions.

My current status - I have committed and pushed from the local `fix-viewing-large-files` directory/branch:

```
~/bzr/loggerhead via 🐍 v3.8.10 (venv)
❯ brz status
unknown:
  fix-viewing-large-files
```

Revision history for this message
Colin Watson (cjwatson) wrote :

There's a Jenkins job that should deal with merges. I'll try top-approving this and see whether it works.

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches