Martin von Zweigbergk 39792368ba git: when exporting, don't overwrite changes made by git ... This fixes the bugs shown by the tests added in the previous patch by checking that the git branches we're about to update have not been updated by git since our last export. If they have, we fail those branches. The user can then re-import from the git repo and resolve any conflicts before exporting again. I had to update the `test_export_import_sequence` to make it pass. That shows a new bug, which I'll fix next. The problem is that the exported view doesn't get updated on import, so we would try to export changes compared to an earlier export, even though we actually knew (because of the `jj git import`) that the state in git had changed.		2022-12-03 09:32:49 -08:00
..
src	git: when exporting, don't overwrite changes made by git	2022-12-03 09:32:49 -08:00
tests	git: when exporting, don't overwrite changes made by git	2022-12-03 09:32:49 -08:00
testutils	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
build.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
Cargo.toml