Resolving patch conflicts manually

Posted by Antony Hatchkins on Stack Overflow See other posts from Stack Overflow or by Antony Hatchkins
Published on 2010-03-18T14:46:54Z Indexed on 2010/03/18 19:41 UTC
Read the original article Hit count: 345

Filed under:

vi

|

vim

|

patch

|

patching

I've downloaded a patch from some site and trying to apply it (twisted, python web framework).

Several hunks failed.

How do I automate manual patching process using vim?

Details:

I'm trying to automate the process of applying failed hunks.

Many tiny changes, each about adding/removing 1-2 chars. Difficult to see.

I Have to create two new temporary files and :diffthis them manually to see the difference. Yes, outside VCS. I can imagine a neat way to deal with it using git, but I would prefer to avoid creating git repo for that.

© Stack Overflow or respective owner

Related posts about vi

How to deal with job that stop and cannot continue unless made foreground?

as seen on Super User - Search for 'Super User'
Recent example: mountlo (using UML): vi@vi-notebook:~/b$ mountlo -m 16 -d /dev/uba1 /home/vi/mnt/usb -t vfat -o iocharset=utf8,allow_other& [1] 32561 vi@vi-notebook:~/b$ Checking that ptrace can change system call numbers...OK Checking syscall emulation patch for ptrace...OK Checking advanced syscall… >>> More
SQLBits VI session submission - Today is your last day

as seen on SQL Blogcasts - Search for 'SQL Blogcasts'
We will be deciding on the sessions tomorrow (Tuesday 8th March) so make sure you get your session in for SQLBits quick. Don't forget we are focussing on performance an scalability so make sure your session covers one or both of these. To submit your session Step 1 - Complete your Speaker Profile… >>> More
SQLBits VI session submission - Today is your last day

as seen on SQL Blogcasts - Search for 'SQL Blogcasts'
We will be deciding on the sessions tomorrow (Tuesday 8th March) so make sure you get your session in for SQLBits quick. Don't forget we are focussing on performance an scalability so make sure your session covers one or both of these. To submit your session Step 1 - Complete your Speaker Profile… >>> More
We've increased the number of sessions for SQLBits VI

as seen on SQL Blogcasts - Search for 'SQL Blogcasts'
Due to the overwhelming number of session submissions we have increased the number. So we now have 24 sessions plus 4 sessions from sponsors planned. To do this we are shortening each session to 50 minutes. I hope this goes down well, I guess we'll see when we get the feedback in. >>> More
We've increased the number of sessions for SQLBits VI

as seen on SQL Blogcasts - Search for 'SQL Blogcasts'
Due to the overwhelming number of session submissions we have increased the number. So we now have 24 sessions plus 4 sessions from sponsors planned. To do this we are shortening each session to 50 minutes. I hope this goes down well, I guess we'll see when we get the feedback in. >>> More

Related posts about vim

Vim: Use different ~/.vim/plugin/ directories for different versions of vim?

as seen on Super User - Search for 'Super User'
Like many of you, my custom Vim configuration is stored in my ~/.vimrc, with the plugins, colors, etc. stored under ~/.vim/plugins, ~/.vim/colors, etc. I want to share a single Vim configuration among many servers. Some of these servers run Vim 7, some run the older Vim 6. Most Vim plugins are intended… >>> More
Why isn't the scripts in my autoload folder being executed in Vim?

as seen on Super User - Search for 'Super User'
I'm trying to use Pathogen to manage my Vim extensions. My bundle folder looks like this: .../bundle/ +-- vim-pathogen ¦ +-- autoload ¦ +-- pathogen.vim +-- vim-smoothscroll +-- autoload +-- smooth_scroll.vim And my vimrc file includes this: let s:root = fnamemodify(resolve(expand(":p"))… >>> More
Cygwin vim doesn't load files in runtimepath

as seen on Super User - Search for 'Super User'
I created a custom syntax file, and but none of the files in $VIMRUNTIME seem to load. I followed these pieces of the documentation: http://vimdoc.sourceforge.net/htmldoc/filetype.html#new-filetype http://vimdoc.sourceforge.net/htmldoc/syntax.html#mysyntaxfile When I do :echo &runtimepath I… >>> More
Debugging matchit plugin in vim (under Cygwin)

as seen on Stack Overflow - Search for 'Stack Overflow'
The "matchit" plugin for vim is supposed to allow you to use the % key to jump between matching start/end tags when editing HTML, as well as /* and */ comment delimiters when editing other kinds of code. I've followed the exact instructions in ":help matchit", but % still doesn't work for me. It… >>> More
Vim: How to execute commands stored in a textfile opened in Vim

as seen on Super User - Search for 'Super User'
I store, commands found at http://www.commandlinefu.com/commands/browse, in a text file. If I open this text file in Vim and I want to execute the command where the cursor is actually located I do copy the line with Y, switching to command mode with : and !CTRL+r* Is there a more "lazy" possibility ;) >>> More