Merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/vim/lucid-201003081817 into lp://qastaging/ubuntu/lucid/vim
Proposed by
James Westby
| Status: | Merged |
|---|---|
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/lucid/vim/lucid-201003081817 |
| Merge into: | lp://qastaging/ubuntu/lucid/vim |
| Diff against target: |
6718 lines (+6658/-0) (has conflicts) 9 files modified
debian/changelog (+6373/-0) debian/vim-doc.docs (+3/-0) runtime/ftplugin/tcl.vim (+36/-0) runtime/indent/mail.vim (+13/-0) runtime/keymap/dvorak.vim (+82/-0) runtime/syntax/sdc.vim (+41/-0) runtime/syntax/taskdata.vim (+43/-0) runtime/syntax/taskedit.vim (+35/-0) src/cleanlint.vim (+32/-0) Text conflict in debian/changelog Conflict adding file debian/vim-doc.docs. Moved existing file to debian/vim-doc.docs.moved. Conflict adding file runtime/ftplugin/tcl.vim. Moved existing file to runtime/ftplugin/tcl.vim.moved. Conflict adding file runtime/indent/mail.vim. Moved existing file to runtime/indent/mail.vim.moved. Conflict adding file runtime/keymap/dvorak.vim. Moved existing file to runtime/keymap/dvorak.vim.moved. Conflict adding file runtime/syntax/sdc.vim. Moved existing file to runtime/syntax/sdc.vim.moved. Conflict adding file runtime/syntax/taskdata.vim. Moved existing file to runtime/syntax/taskdata.vim.moved. Conflict adding file runtime/syntax/taskedit.vim. Moved existing file to runtime/syntax/taskedit.vim.moved. Conflict adding file src/cleanlint.vim. Moved existing file to src/cleanlint.vim.moved. |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/vim/lucid-201003081817 |
| Related bugs: |
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/vim now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/vim/lucid-201003081817. A merge should be performed if necessary.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
