Updating MacVim with latest Vim patches

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Updating MacVim with latest Vim patches

Po Shan Cheah
Hi,

Could anyone tell me what the procedure is for updating MacVim with the latest Vim patches? I tried using hg-git to push from the Vim mercurial repo to the MacVim repo but the git merge resulted in hundreds of conflicts, so that can't be right.

--
--
You received this message from the "vim_mac" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

---
You received this message because you are subscribed to the Google Groups "vim_mac" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/d/optout.
Reply | Threaded
Open this post in threaded view
|

Re: Updating MacVim with latest Vim patches

Limin Tang
On Friday, November 7, 2014 11:53:42 AM UTC-8, Morton Fox wrote:
> Hi,
>
> Could anyone tell me what the procedure is for updating MacVim with the latest Vim patches? I tried using hg-git to push from the Vim mercurial repo to the MacVim repo but the git merge resulted in hundreds of conflicts, so that can't be right.

I tried merging patches 7.4.384-516 from Vim repo directly to MacVim master branch (7.4.383); there are a few conflicts (around 10, definitely not hundreds) and I resolved all them. I posted a Git patch a few days ago.

--
--
You received this message from the "vim_mac" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

---
You received this message because you are subscribed to the Google Groups "vim_mac" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [hidden email].
For more options, visit https://groups.google.com/d/optout.