search

dolthub / dolt

Dolt – Git for Data
Apache License 2.0
17.58k stars 498 forks source link

Allow pulling from a remote if the only changes are to ignored tables. #7979

Closed nicktobey closed 2 months ago

nicktobey commented 2 months ago

This loosens the restrictions for pulling from remotes: instead of requiring that there are no working changes, we allow working changes but only to ignored tables.

If there are conflicting changes to ignored tables (which is rare, since ignored tables shouldn't be pushed to remotes in the first place), this will still abort the pull later when it's computing the new root hash.

This is, IMO, better than what git does. Git will just overwrite the ignored files without warning.

coffeegoddd commented 2 months ago

@nicktobey DOLT

comparing_percentages
100.000000 to 100.000000
version result total
fb60b05 ok 5937457
version total_tests
fb60b05 5937457
correctness_percentage
100.0
coffeegoddd commented 2 months ago

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000
version result total
2db8874 ok 5937457
version total_tests
2db8874 5937457
correctness_percentage
100.0