Skip to content
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.

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

dolt_status table unhelpful during merge when there are constraint violations. #8114

Closed
timsehn opened this issue Jul 10, 2024 · 0 comments · Fixed by #8209
Closed

dolt_status table unhelpful during merge when there are constraint violations. #8114

timsehn opened this issue Jul 10, 2024 · 0 comments · Fixed by #8209
Labels
enhancement New feature or request version control

Comments

@timsehn
Copy link
Contributor

timsehn commented Jul 10, 2024

Repro:

  1. Clone https://www.dolthub.com/repositories/timsehn/three_way_merge
  2. In a sql server, merge fire-tim into main
three_way_merge/main> call dolt_merge('fire-tim');
+------+--------------+-----------+-----------------+
| hash | fast_forward | conflicts | message         |
+------+--------------+-----------+-----------------+
|      | 0            | 1         | conflicts found |
+------+--------------+-----------+-----------------+
1 row in set (0.00 sec)

three_way_merge/main> select * from dolt_status;
+------------+--------+----------+
| table_name | staged | status   |
+------------+--------+----------+
| employees  | 0      | modified |
+------------+--------+----------+
1 row in set (0.00 sec)

This should say constraint violation in status instead of modified. In the case of a schema conflict it says:

three_way_merge/main> select * from dolt_status;
+------------+--------+-----------------+
| table_name | staged | status          |
+------------+--------+-----------------+
| employees  | 0      | schema conflict |
+------------+--------+-----------------+
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request version control
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant