Martin von Zweigbergk d886d8c203 conflicts: extract methods for converting to/from generic legacy form ...

We already have the new `Conflict::from_backend_conflict()` for
converting from a `backend::Conflict`, but we model conflicts in a
similar way in at least `RefTarget`. I'd like to be able to use
`conflicts::Conflict` there too. To prepare for that, let's extract
generic methods from `Conflict::from_backend_conflict()` and
`Conflict::to_backend_conflict()`.

I'm not sure I'll get around to making `RefTarget` use `Conflict` but
this commit seems like nice cleanup either way. It makes the tests
simpler if nothing else.

2023-06-13 21:48:35 +02:00

..

benches

benches: group unchanged/modified/reversed-line diffs together

2023-03-27 23:38:56 +09:00

gen-protos

cargo: bump prost-build from 0.11.8 to 0.11.9

2023-04-14 16:11:09 +00:00

src

conflicts: extract methods for converting to/from generic legacy form

2023-06-13 21:48:35 +02:00

tests

conflicts: remove ConflictId from update_conflict_from_content()

2023-06-13 08:49:46 +02:00

testutils

cargo: bump tempfile from 3.5.0 to 3.6.0

2023-06-08 22:53:55 -07:00

build.rs

lib: replace protobuf crate with prost

2022-12-22 07:04:35 -08:00

Cargo.toml

cargo: bump rustix from 0.37.19 to 0.37.20

2023-06-12 12:29:26 -07:00