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

-- 
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

Raspunde prin e-mail lui