Alexis Sellier 2d55ffba81 cob: Redesign merge state ... Move `merges` from `Revision` to `Patch`, and key them by actor. This ensures that only one merge is possible per actor. We also make sure that only one revision can be merged at a time, and signal a conflict if more than one revision is considered merged. Finally, we make sure that merges have the same target-branch commit to be considered equal.		2023-05-19 18:40:46 +02:00
..
canonical	radicle: custom CanonicalFormatter	2023-02-24 11:59:36 +01:00
cob	cob: Redesign merge state	2023-05-19 18:40:46 +02:00
identity	radicle: update radicle-git-ext	2023-05-08 10:36:15 +01:00
node	httpd: Add `alias` field to certain routes	2023-05-16 12:40:07 +02:00
storage	cli: Merge patches on `git push`	2023-05-16 21:11:57 +02:00
test	cob: Redesign merge state	2023-05-19 18:40:46 +02:00
canonical.rs	radicle: custom CanonicalFormatter	2023-02-24 11:59:36 +01:00
cob.rs	cob: Use `EntryId` as the operation identifier	2023-03-09 17:08:56 +01:00
collections.rs	Split repository into two creates	2022-09-21 15:11:17 +02:00
git.rs	Use `tmp` namespace for temporary refs during push	2023-05-13 23:27:03 +02:00
identity.rs	cob: Don't require a local fork to exist	2023-03-01 15:40:30 +01:00
lib.rs	radicle: update radicle-git-ext	2023-05-08 10:36:15 +01:00
node.rs	node: Implement `rad sync` command	2023-04-24 11:39:37 +02:00
profile.rs	cli: Remove `rad fetch` command	2023-04-24 14:19:31 +02:00
rad.rs	cli: Use `git push` to open or update patches	2023-05-12 12:22:08 +02:00
serde_ext.rs	node: Use JSON for control commands	2023-02-07 10:46:12 +01:00
sql.rs	node: Keep track of connection attempts	2023-05-05 17:23:52 +02:00
storage.rs	cli: Use `git push` to open or update patches	2023-05-12 12:22:08 +02:00
test.rs	cob: Redesign merge state	2023-05-19 18:40:46 +02:00