On 16/03/12 18:20, skeept wrote:
Hi,
I would like to know if it is possible to include
runtime/doc/tags in .hgignore?
after I build vim this file shows as modified in mercurial and then
when I try to pull again
I get some kind of error message regarding uncommited local changes.
Alternatively is there a mercurial command to always copy the remote
files irrespective of whatever
local changes I have?
Thanks.
Yes, it is possible (I do it), BUT: not only do I get a prompt whenever
I try to pull changes including runtime/doc/tags, but in addition that
prompt is not visible until AFTER I answer it, because I log
stdin/stderr (via tee, so they are also echoed on the terminal) and for
some reason Mercurial buffers its output blockwise rather than linewise
when it is redirected, including to tee (this might be a "python"
problem rather than Mercurial-specific).
To workaround this limitation I always run "hg in" first (and my ~/.hgrc
includes a [ui] section with, among others, a line saying "verbose =
true" without the quotes). This way, if there are changes to
./runtime/doc/tags I can see it, and I'm forwarned that the later fetch
step (I use the fetch extension to run pull-update-merge in one step)
will "hang" on the not-yet-displayed question:
remote changed runtime/doc/tags which local deleted
use (c)hanged version or leave (d)eleted?
so I'll have to "blind-type" d to make it continue. (Running "hg in"
also tells me if there are _no_ changes, in which case, of course,
nothing more is necessary.)
Mentioning runtime/doc/tags in hgignore does not make it get out of step
with the remote version, since (at least on Unix-like systems: I'm on
Linux) it is rebuilt from scratch as part of the "tags" target invoked
by the "make install" step.
Best regards,
Tony.
--
Conscience is the inner voice that warns us somebody is looking
-- H. L. Mencken
--
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
