Related, perhaps off topic.
I was doing "hg bisect" a few days ago, the pass/fail detection had to
build vim and run a test. The process aborted after several iterations
because of a writable source file and the working directory couldn't be
updated. (I made notes, but lost them in the heat of battle)
There were two artifacts when bisect aborted. One was something very
much like
M src/po/ja.sjis.po
The other was an untracked file with the same, or very similar, name; maybe at
a different level in the tree.
I fixed the problem by add "hg revert" after building, so the bisect rev update
wouldn't abort. Probably changed other stuff as well. I think I've seen this source tree
file as writable before, sometime within the last few weeks.
-ernie
On 23/08/20 1:34 AM, Christian Brabandt wrote:
On Sa, 19 Aug 2023, tooth pik wrote:
Unstaged changes after reset:
M src/po/ja.sjis.po
M src/po/zh_CN.cp936.po
M src/po/zh_CN.po
error: Your local changes to the following files would be overwritten by merge:
src/po/ja.sjis.po
src/po/zh_CN.cp936.po
src/po/zh_CN.po
Please commit your changes or stash them before you merge.
Aborting
Updating 56bafd7a6..4b1cc7906
Not sure what you are trying to say here. You need to get rid of the
changes to your local files before you can update them. So that's why I
suggested to use git reset --hard. Note this will wipe out all your
changes. So only do this if you don't care about it. Other options would
be to use git stash for example, that would stash away your changes (and
you could get them later back).
Best,
Christian
--
--
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
---
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/de026c02-a065-647e-956a-43a5e7ed2341%40raelity.com.
