Ubuntu
vim package

Merge lp://qastaging/~adam-buchbinder/ubuntu/lucid/vim/vim-large-file-recovery into lp://qastaging/ubuntu/lucid/vim

  1. Lucid (10.04)
  2. vim-large-file-recovery
  3. Merge into lucid
Proposed by Adam Buchbinder
Status: Merged
Merge reported by: Marc Deslauriers
Merged at revision: not available
Proposed branch: lp://qastaging/~adam-buchbinder/ubuntu/lucid/vim/vim-large-file-recovery
Merge into: lp://qastaging/ubuntu/lucid/vim
Diff against target: 162 lines (+70/-5)
9 files modified
debian/changelog (+14/-0)
src/memline.c (+1/-0)
src/testdir/Make_amiga.mak (+2/-1)
src/testdir/Make_dos.mak (+1/-1)
src/testdir/Make_ming.mak (+1/-1)
src/testdir/Make_vms.mms (+1/-1)
src/testdir/Makefile (+1/-1)
src/testdir/test70.in (+46/-0)
src/testdir/test70.ok (+3/-0)
To merge this branch: bzr merge lp://qastaging/~adam-buchbinder/ubuntu/lucid/vim/vim-large-file-recovery
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Adam Buchbinder (community) Needs Resubmitting
Jamie Strandboge Needs Fixing
Review via email: mp+127161@code.qastaging.launchpad.net

Description of the change

vim (2:7.2.330-1ubuntu2.1) lucid-proposed; urgency=low

  * Backported upstream patch 7.3.216 (LP: #1059085):
    - src/memline.c: Avoid corruption on large-file recovery.
    - src/testdir/test70.in, src/testdir/test70.ok:
      Test large-file recovery.
    - src/testdir/Makefile, src/testdir/Make_amiga.mak,
      src/testdir/Make_dos.mak, src/testdir/Make_os2.mak,
      src/testdir/Make_vms.mms: Update Makefiles to include new tests.

 -- Adam Buchbinder <email address hidden> Sun, 30 Sep 2012 10:44:38 -0400

To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

Thanks for your patch! In general it looks ok, but the changelog lacks the origins of the patch, which makes it difficult to review the patch against upstream. Normally we would use DEP-3 comments in the patch in debian/patches itself, but because vim on Ubuntu 10.04 LTS does not use a patch system, this information should be included in the debian/changelog. Can you resubmit with this information? Thanks!

review: Needs Fixing
Revision history for this message
Adam Buchbinder (adam-buchbinder) wrote :

Googling "vim 7.3.216", the first link is the upstream patch. I'll add a link to the Groups post.

lp://qastaging/~adam-buchbinder/ubuntu/lucid/vim/vim-large-file-recovery updated
59. By Adam Buchbinder

Backported upstream patch 7.3.216 from
https://groups.google.com/d/topic/vim_dev/lTos-bGcNgU/discussion
(LP: #1059085):

Revision history for this message
Adam Buchbinder (adam-buchbinder) wrote :

Is that a better description?

review: Needs Resubmitting
Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Looks good. ACK. Uploading to lucid-proposed for processing by the SRU team.

Thanks!

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

to all changes: