On Sunday 16 November 2008 2:34 pm, Markus Heidelberg wrote: > > sc, 15.11.2008: > > > > I finally bit the bullet and applied Markus Heidelberg's relative number > > patch to my source -- I love it so much I added > > Nice to hear. > > With subversion you don't have to reapply the patch. When working on this > feature, "svn update" auto-merged my local changes. > With rsync I'm not sure. Searching the man page for "merge" shows several > matches, so it seems to be possible, too. But I don't have experience with it. I learned this myself today -- svn updated to 7.2.42 and on the modules affected by both the .42 update and relative number patch, svn performed a merge, not a replace. I am beginning to suspect rsync is equally intelligent, but I have yet to prove it.
Ok -- I took a deep breath and did an rsync -- it replaces. The good news is the modules it replaced are the same as the last rsync (as far as what was in the relative number patch) so I can use the same patch extract as last time: Index: runtime/menu.vim Index: runtime/optwin.vim Index: runtime/doc/options.txt Index: runtime/doc/quickref.txt Index: runtime/doc/syntax.txt Index: runtime/doc/version7.txt Index: runtime/lang/menu_de_de.latin1.vim Index: runtime/syntax/vim.vim > You could also use the vim_extended git repository, of course. I'll try to add > a runtime branch. When this would work with correct merging, then it would be > even easier, you could get your patches and runtime updates with one command. For now at least, svn/rsync are doing the job for me, but who knows what the future holds. And thanx again for a great patch. It is worlds above Charles' relative number plugin (no offense, Charles) and really should be part of mainstream vim. sc --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
