On 14/05/10 21:08, Tony Mechelynck wrote:
On 14/05/10 19:06, Markus Heidelberg wrote:
Tony Mechelynck, 2010-05-14 05:11:
However, I have a few "home
patches", one of which adds an "Extra patch" near the end of version.c
-- with the patches distributed by ftp this was no problem, as this
change is after the added patches: patch doesn't even notice it. But
with Mercurial as distributed it meant hg pull, hg merge, hg commit (3
separate Mercurial functions) for each patch (or set of patches)
pulled,
because Mercurial notices that version.c has been modified by Bram and
needs to be merged -- every time -- with the change I made.
You always have to merge, even if a patch from Bram doesn't touch the
same file as your local changes.
What I've done is made a "local changeset" and committed it, then found
out that for every new official patch it was the pull-merge-commit
rigmarole again. I expect that with the fetch extension it'll be a lot
smoother.
Maybe you want to enable the rebase extension and use "hg pull --rebase"
to keep your local changes on top of the history.
Markus
Update after Bram published changes up to 7.2.429:
- The fetch extension does exactly what I need, it even supplies a
sensible merge comment, viz. "Automated merge with
https://vim.googlecode.com/hg/";. (From the docs: if there had been no
need to merge it would have done a pull-and-update instead, just like hg
pull -u)
- There was one file which I had forgotten to ignore: runtime/doc/tags,
which is rebuilt at every install (and mine is different from Bram's
because I have brought float-ext.txt into the local repo for consistency
with Bill McCarthy's changes to eval.c).
Best regards,
Tony.
All right, I think I have the process reasonably steamrolled, with local
changes to the source (otherwise there would hardly be anything to
document), and using the hg fetch extension; and I have documented it:
http://vim.wikia.com/wiki/Getting_the_Vim_source_with_Mercurial
John's bot will no doubt add the {{TipProposed}} header at the top some
time soon.
Best regards,
Tony.
--
Good day for water sports. Take a bath with a friend.
--
You received this message from the "vim_dev" 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
