Skip to content

fix(cram): allow text after conflict markers #12655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alizter merged 1 commit into from
Oct 30, 2025
Merged

fix(cram): allow text after conflict markers #12655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/changes/added/12538.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- Add a `(conflict_markers error|ignore)` option to the cram stanza. When
`(conflict_markers error)` is set, the cram test will fail in the presence of
conflict markers. Git, diff3 and jujutsu conflict markers are detected.
(#12538, #12617, fixes #12512, @rgrinberg, @Alizter)
(#12538, #12617, #12655, fixes #12512, @rgrinberg, @Alizter)
9 changes: 4 additions & 5 deletions src/dune_rules/cram/cram_exec.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,15 @@ let quote_for_sh fn =

let cram_stanzas =
let is_conflict_marker line =
match line with
| "=======" | "%%%%%%%" | "+++++++" | "-------" | "|||||||" -> true
| _ -> false
[ "======="; "%%%%%%%"; "+++++++"; "-------"; "|||||||" ]
|> List.exists ~f:(fun prefix -> String.is_prefix line ~prefix)
in
let find_conflict state line =
match state with
| `No_conflict when line = "<<<<<<<" -> `Started
| `No_conflict when String.is_prefix ~prefix:"<<<<<<<" line -> `Started
| `Started when is_conflict_marker line -> `Has_markers
| `Has_markers when is_conflict_marker line -> `Has_markers
| `Has_markers when line = ">>>>>>>" ->
| `Has_markers when String.is_prefix ~prefix:">>>>>>>" line ->
(* CR-someday rgrinberg for alizter: insert a location spanning the
entire once we start extracting it *)
User_error.raise
Expand Down
26 changes: 13 additions & 13 deletions test/blackbox-tests/test-cases/cram/conflict-markers-jj.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ Cram tests can forbid jujutsu conflicts:
Full jujutsu conflict without command and output interleaving:

$ cat >test.t <<EOF
> <<<<<<<
> <<<<<<< Conflict 1 of 2
> A Small
> %%%%%%%
> Conflict
> >>>>>>>
> >>>>>>> Conflict 1 of 2 ends
> $ echo tada
> EOF

Expand All @@ -30,11 +30,11 @@ Full jujutsu conflict without command and output interleaving:
Full jujutsu conflict with command and output interleaving:

$ cat >test.t <<EOF
> <<<<<<<
> <<<<<<< Conflict 2 of 2
> $ foo
> %%%%%%%
> > bar
> >>>>>>>
> >>>>>>> Conflict 2 of 2 ends
> $ echo tada
> EOF

Expand All @@ -49,14 +49,14 @@ Full jujutsu conflict with command and output interleaving:
Jujutsu default style conflict (diff + snapshot):

$ cat >test.t <<EOF
> <<<<<<<
> %%%%%%%
> <<<<<<< Conflict 1 of 1
> %%%%%%% Changes from base to side #1
> -apple
> +grapefruit
> +++++++
> +++++++ Contents of side #2
> APPLE
> GRAPE
> >>>>>>>
> >>>>>>> Conflict 1 of 1 ends
> $ echo tada
> EOF

Expand All @@ -71,14 +71,14 @@ Jujutsu default style conflict (diff + snapshot):
Jujutsu snapshot style conflict:

$ cat >test.t <<EOF
> <<<<<<<
> +++++++
> <<<<<<< Conflict 1 of 1
> +++++++ Contents of side #1
> Left side
> -------
> ------- Contents of base
> Original
> +++++++
> +++++++ Contents of side #2
> Right side
> >>>>>>>
> >>>>>>> Conflict 1 of 1 ends
> $ echo tada
> EOF

Expand Down
Loading