From 2ccf5ec1aa31224065c3e92f8a337940c5ab9a76 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 17 Apr 2020 01:25:20 +0200 Subject: [PATCH] exemple outils gestion version --- src/centralised_vcs.dot | 19 +++++++++++++++++++ src/decentralised_vcs.dot | 31 +++++++++++++++++++++++++++++++ src/slides.adoc | 18 +++++++++++++++++- 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 src/centralised_vcs.dot create mode 100644 src/decentralised_vcs.dot diff --git a/src/centralised_vcs.dot b/src/centralised_vcs.dot new file mode 100644 index 0000000..8ed4590 --- /dev/null +++ b/src/centralised_vcs.dot @@ -0,0 +1,19 @@ +digraph g { + subgraph cluster_vsc { + label = "Serveur Central" + subgraph cluster_vsc_database { + label = "Base de données" + version_1 -> version_2 -> version_3 -> version_4 + } + } + subgraph cluster_alice { + label = "PC d'Alice" + rapport_alice [label = "rapport.md"] + version_3 -> rapport_alice + } + subgraph cluster_bob { + label = "PC de Bob" + rapport_bob [label = "rapport.md"] + version_2 -> rapport_bob + } +} \ No newline at end of file diff --git a/src/decentralised_vcs.dot b/src/decentralised_vcs.dot new file mode 100644 index 0000000..4d31458 --- /dev/null +++ b/src/decentralised_vcs.dot @@ -0,0 +1,31 @@ +digraph g { + compound=true + subgraph cluster_vsc { + label = "Serveur Central" + subgraph cluster_vsc_database { + label = "Base de données" + version_1 -> version_2 -> version_3 -> version_4 + } + } + subgraph cluster_alice { + label = "PC d'Alice" + subgraph cluster_alice_database { + label = "Base de données" + version_1a -> version_2a -> version_3a -> version_4a + } + rapport_alice [label = "rapport.md"] + version_3a -> rapport_alice + } + subgraph cluster_bob { + label = "PC de Bob" + subgraph cluster_bob_database { + label = "Base de données" + version_1b -> version_2b -> version_3b -> version_4b + } + rapport_bob [label = "rapport.md"] + version_2b -> rapport_bob + } + version_1b -> version_1 [dir=both ltail=cluster_bob_database lhead=cluster_vsc_database] + version_1a -> version_1 [dir=both ltail=cluster_alice_database lhead=cluster_vsc_database] + version_1a -> version_1b [dir=both ltail=cluster_alice_database lhead=cluster_bob_database] +} \ No newline at end of file diff --git a/src/slides.adoc b/src/slides.adoc index 0ac2361..de80903 100644 --- a/src/slides.adoc +++ b/src/slides.adoc @@ -54,6 +54,22 @@ mon_projet/ === Pour péréniser tout ça -== Connaître les types de fonctionnements existants +== Outils de gestion de version + +=== Gestion type CP_OLD + +=== Système centralisée + +[graphviz,centralised-vcs,svg] +---- +include::centralised_vcs.dot[] +---- + +=== Système décentralisé + +[graphviz,decentralised-vcs,svg] +---- +include::decentralised_vcs.dot[] +---- == De s’approprier un outil de gestion de versions \ No newline at end of file