https://bz.mercurial-scm.org/show_bug.cgi?id=6041
Bug ID: 6041 Summary: pull and incoming can get confused by an obsolete tip Product: Mercurial Version: 4.8.1 Hardware: All OS: All Status: UNCONFIRMED Severity: bug Priority: normal Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: matt_harbi...@yahoo.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org On Windows 7, I've got this repo being served up: @ 48064[tip] 4ca7129e5c1f 2018-12-23 23:01 -0500 matt_harbison | largefiles: drop the uisetup module | o 48063:48059 05fbe3a458be 2018-12-23 22:57 -0500 matt_harbison | largefiles: port wrapped functions to exthelper | o 48059 32aa43e03857 2018-12-23 17:26 -0500 matt_harbison | largefiles: port commands to exthelper | o 48058:48051 a341e513e16c 2018-12-23 21:54 -0500 matt_harbison | exthelper: support the option argument when registering a command | o 48051:48049 be536e648c4f 2018-12-23 16:16 -0500 matt_harbison | largefiles: port configitems to exthelper ~ I cloned to a Windows 10 system, and amended 4ca7129e5c1f: $ hg log --hidden -l 6 -G @ changeset: 41205:6a6b8808738b | tag: tip | parent: 41203:05fbe3a458be | user: Matt Harbison <matt_harbi...@yahoo.com> | date: Sun Dec 23 23:01:51 2018 -0500 | summary: largefiles: drop the uisetup module | | x changeset: 41204:4ca7129e5c1f |/ user: Matt Harbison <matt_harbi...@yahoo.com> | date: Sun Dec 23 23:01:51 2018 -0500 | obsolete: amended using amend as 41205:6a6b8808738b | summary: largefiles: drop the uisetup module | o changeset: 41203:05fbe3a458be | parent: 41200:32aa43e03857 | user: Matt Harbison <matt_harbi...@yahoo.com> | date: Sun Dec 23 22:57:03 2018 -0500 | summary: largefiles: port wrapped functions to exthelper | | x changeset: 41202:3feac485cd01 | | user: Matt Harbison <matt_harbi...@yahoo.com> | | date: Sun Dec 23 23:01:51 2018 -0500 | | obsolete: rebased using evolve as 41204:4ca7129e5c1f | | summary: largefiles: drop the uisetup module | | | x changeset: 41201:12bf136efab3 |/ user: Matt Harbison <matt_harbi...@yahoo.com> | date: Sun Dec 23 22:57:03 2018 -0500 | obsolete: amended using amend as 41203:05fbe3a458be | summary: largefiles: port wrapped functions to exthelper | o changeset: 41200:32aa43e03857 | user: Matt Harbison <matt_harbi...@yahoo.com> ~ date: Sun Dec 23 17:26:25 2018 -0500 summary: largefiles: port commands to exthelper However, `hg pull` thinks that the amended commit is incoming: $ hg in default-push -r tip comparing with http://envy:8000/ searching for changes changeset: 41204:4ca7129e5c1f user: Matt Harbison <matt_harbi...@yahoo.com> date: Sun Dec 23 23:01:51 2018 -0500 obsolete: amended using amend as 41205:6a6b8808738b summary: largefiles: drop the uisetup module ... and pull aborts: $ hg pull default-push -r tip --traceback pulling from http://envy:8000/ searching for changes no changes found Traceback (most recent call last): File "mercurial\scmutil.pyo", line 166, in callcatch File "mercurial\dispatch.pyo", line 354, in _runcatchfunc File "mercurial\dispatch.pyo", line 994, in _dispatch File "mercurial\dispatch.pyo", line 737, in runcommand File "mercurial\dispatch.pyo", line 1003, in _runcommand File "mercurial\dispatch.pyo", line 991, in <lambda> File "mercurial\util.pyo", line 1644, in check File "mercurial\util.pyo", line 1644, in check File "hgext\rebase.pyo", line 1861, in pullrebase File "mercurial\util.pyo", line 1644, in check File "mercurial\util.pyo", line 1644, in check File "hgext3rd\evolve\__init__.pyo", line 797, in warnobserrors File "mercurial\util.pyo", line 1644, in check File "mercurial\util.pyo", line 1644, in check File "hgext3rd\evolve\__init__.pyo", line 773, in wrapmayobsoletewc File "mercurial\util.pyo", line 1644, in check File "mercurial\commands.pyo", line 4420, in pull File "mercurial\changelog.pyo", line 371, in rev FilteredLookupError: 00changelog.i@4ca7129e5c1f35c08923acf7d7583a4f26033d39: filtered node abort: 00changelog.i@4ca7129e5c1f35c08923acf7d7583a4f26033d39: filtered node! I suspect the problem here is specifying -r, which I'm only doing to avoid bringing over a bunch of other junk. -- You are receiving this mail because: You are on the CC list for the bug. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel