2008/11/16 Edward L. Fox <[EMAIL PROTECTED]>: > <[EMAIL PROTECTED]> wrote: >> >> You fetch from the trunk branch, right? What kind of conflicts did arise? I >> suspect mostly from the runtime files!? > > Any conflicts are possible. I'm not feeling surprised to that. > Because there's no much relationship in technical layer between the > trunk and the branches. The branches are not copied from the trunk. > I'm not quite satisfied with the Subversion repository. However, I > don't know what I can do to improve the current situation.
Yes, there were lots of conflicts in src/. Conflicts in the runtime files are irrelevant since when I rsync I also delete all old runtime files. I think I ended up resolving all conflicts by simply replacing the old files with the new ones. Anyway, all this makes me wonder if we really should be basing the Git repo on the SVN repo since not even Edward is satisfied with it. I've been thinking if it wouldn't be simpler to just apply the patches Bram posts myself. Did you consider this option Markus? Björn --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
