From add57b8345514a473a63e7acf971240efe063284 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Wed, 26 Feb 2025 18:02:06 +0400
Subject: [PATCH] modifs.mineures sans commentaires

---
 wip/_merge82      |  2 +-
 wip/dot-pdeps.yml | 13 -------------
 wip/pman          |  3 +++
 wip/pmer          |  7 +++++++
 wip/prel          |  3 +++
 5 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 wip/dot-pdeps.yml

diff --git a/wip/_merge82 b/wip/_merge82
index 5d92afd..9c66921 100755
--- a/wip/_merge82
+++ b/wip/_merge82
@@ -2,4 +2,4 @@
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
 source "$(dirname -- "$0")/../load.sh" || exit 1
 
-exec "$MYDIR/prel" -bdev82 dev74 "$@"
+exec "$MYDIR/pmer" -Bdev82 dev74 "$@"
diff --git a/wip/dot-pdeps.yml b/wip/dot-pdeps.yml
deleted file mode 100644
index 53aeb51..0000000
--- a/wip/dot-pdeps.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 mode: yaml -*- vim:sw=2:sts=2:et:ai:si:sta:fenc=utf-8
-
-branch: develop
-flows:
-  default:
-    develop: develop
-    feature: wip/
-    release: release-
-    main:
-      name: master
-      tag_prefix: null
-      tag_suffix: null
-    hotfix: hotfix-
diff --git a/wip/pman b/wip/pman
index cc5e710..493c8ea 100755
--- a/wip/pman
+++ b/wip/pman
@@ -244,4 +244,7 @@ init)
     git_ensure_cleancheckout
     init_action "$@"
     ;;
+*)
+    die "$action: action non implémentée"
+    ;;
 esac
diff --git a/wip/pmer b/wip/pmer
index 616fb80..eeabed5 100755
--- a/wip/pmer
+++ b/wip/pmer
@@ -125,9 +125,16 @@ merge)
     develop|release|hotfix)
         die "$SrcBranch: cette branche doit être fusionnée dans $DestBranch avec prel"
         ;;
+    *)
+        # n'autoriser la suppression que pour feature
+        [ "$SrcType" == feature ] || Delete=
+        ;;
     esac
     git_ensure_cleancheckout
     ensure_branches
     merge_action "$@"
     ;;
+*)
+    die "$action: action non implémentée"
+    ;;
 esac
diff --git a/wip/prel b/wip/prel
index 2a7d222..da06fe9 100755
--- a/wip/prel
+++ b/wip/prel
@@ -196,4 +196,7 @@ release)
     *) create_release_action "$@";;
     esac
     ;;
+*)
+    die "$action: action non implémentée"
+    ;;
 esac