Skip to content

Fix difference between bootstrap & dune behaviour w.r.t include-subdirs ambiguity#12607

Merged
shonfeder merged 1 commit intoocaml:mainfrom
Alizter:push-mxlmmvsxqqup
Oct 22, 2025
Merged

Fix difference between bootstrap & dune behaviour w.r.t include-subdirs ambiguity#12607
shonfeder merged 1 commit intoocaml:mainfrom
Alizter:push-mxlmmvsxqqup

Conversation

@Alizter
Copy link
Copy Markdown
Collaborator

@Alizter Alizter commented Oct 21, 2025

The PR #12587 was reverted in #12606. This reverts it again so that it can be reviewed properly.

…rs ambiguity

Signed-off-by: Ali Caglayan <alizter@gmail.com>
@Alizter Alizter marked this pull request as ready for review October 21, 2025 12:36
@shonfeder
Copy link
Copy Markdown
Member

By "reviewed properly" does it just mean having a review by @anmonteiro ? Asking because the other PR was reviewed by 2, and got an approval, and no defect seems to be reported here, so I'm not sure if something else is missing.

@Alizter
Copy link
Copy Markdown
Collaborator Author

Alizter commented Oct 21, 2025

Yes, @rgrinberg requested that @anmonteiro also took a look.

@shonfeder
Copy link
Copy Markdown
Member

Thanks for the review @anmonteiro !

@shonfeder shonfeder merged commit 94c1424 into ocaml:main Oct 22, 2025
24 of 25 checks passed
davesnx added a commit to davesnx/dune that referenced this pull request Oct 22, 2025
…without-system

* 'main' of github.com:/ocaml/dune: (33 commits)
  Fix difference between bootstrap & dune behaviour w.r.t include-subdirs ambiguity (ocaml#12607)
  Revert "Fix difference between bootstrap & dune behaviour w.r.t include-subdirs ambiguity"
  fix(include-subdirs-qualified): prefer closer module of the same name
  Add 2 tests showing difference between bootstrap & dune w.r.t include-subdirs
  dune init: use source path (ocaml#12601)
  chore(deps): bump actions/setup-node from 5 to 6
  test(melange): show melange compilation isn't part of `@all` alias (ocaml#12603)
  Disable flaky test (ocaml#12600)
  Rename path to dir in dune_init (ocaml#12599)
  Dune project: remove dead code (ocaml#12598)
  Dune_project refactor (ocaml#12597)
  doc(melange): reference `dirs` stanza (ocaml#12596)
  Stanza simplifications (ocaml#12595)
  Reduce stanza definition boilerplate (ocaml#12592)
  Rename Stanza_common to Stanza_pkg (ocaml#12593)
  Remove copied code between library and library_parameter stanzas (ocaml#12594)
  Split modules settings (ocaml#12591)
  Move the (include_subdirs qualified) check to a single place (ocaml#12590)
  refactor: simplify loc/ocamllex/ocamlyacc stanza handling (ocaml#12589)
  pkg: Implement a package search command
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants