http://bugzilla.opensuse.org/show_bug.cgi?id=954556 http://bugzilla.opensuse.org/show_bug.cgi?id=954556#c2 --- Comment #2 from Tony Mechelynck --- On 13.2 it was the version from openSUSE with all software updates to date if any, but since it's gone I can't specify it with more precision. On Leap, "hg --version" (when run at the top of the problematic repository) answers: Mercurial Distributed SCM (version 3.5.1) (see http://mercurial.selenic.com for more information) Copyright (C) 2005-2015 Matt Mackall and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Enabled extensions: churn color fetch graphlog strip mq pager progress Yes this is out of the box from openSUSE. I wonder where "strip" comes from (or is it from mq?) Running "hg --pager=yes showconfig" in the same directory shows *no* "extensions.strip" line. Otherwise all extensions.* lines have nothing after the equal sign. -- You are receiving this mail because: You are on the CC list for the bug.

http://bugzilla.opensuse.org/show_bug.cgi?id=954556 http://bugzilla.opensuse.org/show_bug.cgi?id=954556#c3 --- Comment #3 from Tony Mechelynck --- Had it again, but my workflow is improving a little: 1) "hg fetch --switch-parent" still does a pull but aborts the merge: $ hg fetch --switch-parent || echo 'exit status' $? ; date pulling from https://bitbucket.org/vim-mirror/vim searching for changes sampling from both directions adding changesets adding manifests adding file changes added 13 changesets with 34 changes to 23 files (+1 heads) resolving manifests 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merging with 7275:8896150aba23 resolving manifests runtime/doc/tags: untracked file differs abort: untracked files in working directory differ from files in requested revision exit status 255 Thu 19 Nov 22:32:03 CET 2015 2) then after updating to the latest common ancestor and back to the newest pulled changeset: $ hg merge -r 7262 resolving manifests local changed runtime/doc/tags which remote deleted use (c)hanged version or (d)elete? d removing runtime/doc/tags [...] 103 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg commit -m 'merge local with https://bitbucket.org/vim-mirror/vim' committing files: [...] committing manifest committing changelog committed changeset 7276:01ce4237faad N.B. - revision 7262 (decimal) was the tip before the fetch - Under 13.2 the fetch succeeded, telling me "remote changed runtime/doc/tags which local deleted" instead (since we were on the other branch) - I'd prefer to see fewer files "updated" by the merge step, as it used to be under 13.2. I think it makes a difference to the following "make" (does it react the same way to a file left in place and to a file removed then added back?). - Strangely enough, the "hg log" entry for the merge commit mentions only one file (the one I removed by answering d at the prompt), not 103. - By doing "hg diff" between the new tip (the merge commit) and one of its parents, I notice that some files listed in .hgignore (linkable objects from a previous "make", apparently) have been "added". Is this normal? (The .hgignore uses glob syntax, its first line is "syntax: glob", and no other line starts with "syntax".) It seems the merge succeeds in one direction and fails in the other one, while obtaining (AFAICT) the same result in the working directory. -- You are receiving this mail because: You are on the CC list for the bug.

http://bugzilla.opensuse.org/show_bug.cgi?id=954556 http://bugzilla.opensuse.org/show_bug.cgi?id=954556#c5 Tony Mechelynck changed: What |Removed |Added ---------------------------------------------------------------------------- Whiteboard|[regression Leap 42.1 vs |[regression Leap 42.1 vs |openSUSE 13.2] |openSUSE 13.2] [CLOSEME | |2015-12-27 WFM] --- Comment #5 from Tony Mechelynck --- Somehow it went back to normal today: Mercurial (still hg 3.5.1) asked remote changed runtime/doc/tags which local deleted use (c)hanged version or leave (d)eleted? and did the merge after I answered d. Let's declare this WORKSFORME if it doesn't reappear within a month. -- You are receiving this mail because: You are on the CC list for the bug.

http://bugzilla.opensuse.org/show_bug.cgi?id=954556 http://bugzilla.opensuse.org/show_bug.cgi?id=954556#c7 --- Comment #7 from Tony Mechelynck --- Running "hg diff" between the tip of the latest merge and its remote parent (hg --pager=yes diff -r 7381 -r tip) shows a lot of "new" files which are, however, mentioned in .hgignore. These files are a few symlinked directories with a strange line "\ No newline at end of file" at the end, objects (*.o), executables (no extension on Linux, but mode +x, and known names), "compiled" dictionaries (*.mo), and a few sources in src/auto/ (auto/*.h), all of which are regenerated by make whenever they are seen to be out-of-date with the corresponding sources or with whatever the makefile makes them depend on. IMHO anything mentioned in .hgignore should be missing from the Mercurial records and in particular from the diff I ran. I wonder what went wrong where but as long as compilation works (and gives me the expected executable) I'm going to regard it as a strange quirk rather than as a bug. The only reason I'm mentioning it at all is that it might be a symptom of something I'm not aware of. -- You are receiving this mail because: You are on the CC list for the bug.

http://bugzilla.opensuse.org/show_bug.cgi?id=954556 http://bugzilla.opensuse.org/show_bug.cgi?id=954556#c11 Tony Mechelynck changed: What |Removed |Added ---------------------------------------------------------------------------- Version|Leap 42.3 |Leap 15.1 --- Comment #11 from Tony Mechelynck --- In reply to comment #9: I haven't tried to intentionally reproduce the bug. The workaround mentioned in comment #9 works, but if I forget to delete the problematic file, and there are upstream changes to it, "hg fetch" will pull the changes but not merge them and I have to delete the file manually ("make" will recreate it the next time I build) and then "update" my clone to the appropriate changeset to "merge" the changes manually. I suppose (and regret) that this bug will remain WONTFIX. Anyone willing and able to solve it, feel free to REOPEN it and ASSIGN it to yourself. Or report it to Mercurial if that's where it should be solved; but the Mercurial guys will propably answer: "You're using an old version of Mercurial; upgrade to the latest version first, and then we can talk business." -- You are receiving this mail because: You are on the CC list for the bug.