What | Removed | Added |
---|---|---|
Status | RESOLVED | REOPENED |
Version | Leap 42.1 | Leap 42.3 |
Resolution | WONTFIX | --- |
Whiteboard | [regression Leap 42.1 vs openSUSE 13.2] | [regression Leap 42.1 vs openSUSE 13.2] [workaround see comment #9] |
OS | openSUSE 42.1 | openSUSE 42.3 |
AFAIK the bug is still there but I found a workaround, which I forgot to report in this bug: ��� Always run "hg in" before actually pulling ��� If there is a change to the problematic file (ignored on local but not on remote), delete it explicitly on the local clone (in the case of ./runtime/doc/tags for a Vim clone, "make install" will rebuild it anyway) ��� Now "hg fetch" will again give the prompt it used to do on openSUSE 13.2 and before (slightly changed from the one in comment #6 above, and with more options). The answer is "d" (leave Deleted) which won't pull the file from the remote. My current version of Mercurial is 4.2.3-12.1, installed April 4 from the openSUSE 42.3 Update-Test repo.