Anki/rslib
RumovZ ba43c7fdc1
Merge all conflicting notetypes (#2707)
* Refactor import apkg tests

* Merge conflicting notetypes regardless of id match

Original ids are a new thing, and we need to handle previous remappings.
This is done separately from the conflict resolution for notetypes with
matching ids, because 1) we need to look at the notes to determine
conflicts, and 2) we don't want to change the notetype of *all* existing
notes with the conflicting notetype. The main reason is that for 2
existing notes with the same noteype, their incoming counterparts could
have *different* notetypes. So to get rid of all conflicts, they must be
resolved on a note-by-note basis.

* Delete merged, now unused notetypes
2023-10-05 06:18:10 +00:00
..
benches Update Rust and Python deps (#2567) 2023-07-01 18:26:43 +10:00
i18n Stop including Qt translations when EXTRA_FTL_ROOT provided 2023-07-04 18:26:27 +10:00
io Tooltips for CSV import and import page refactoring (#2655) 2023-09-14 09:06:15 +10:00
linkchecker Drop workspace-hack in favor of workspace deps 2023-06-23 17:41:31 +10:00
process Refactor media sync handling (#2647) 2023-09-10 13:22:20 +10:00
proto Merging Notetypes on Import (#2612) 2023-09-09 09:00:55 +10:00
proto_gen Update nightly formatter 2023-09-02 16:13:50 +10:00
src Merge all conflicting notetypes (#2707) 2023-10-05 06:18:10 +00:00
sync Support creating a standalone sync server 2023-07-02 18:22:44 +10:00
tests/support move linkchecker into separate crate 2021-12-20 17:27:43 +10:00
.gitignore initial Bazel conversion 2020-11-01 14:26:58 +10:00
bench.sh Update Rust and Python deps (#2567) 2023-07-01 18:26:43 +10:00
build.rs Fix building outside workspace 2023-07-02 18:22:44 +10:00
Cargo.toml Update incompatible Rust deps 2023-09-28 10:00:47 +10:00
README.md Move away from Bazel (#2202) 2022-11-27 15:24:20 +10:00
rust_interface.rs Update nightly formatter 2023-09-02 16:13:50 +10:00

Anki's Rust code.