modifs.mineures sans commentaires

wip/_rel

@@ -3,13 +3,15 @@
 source "$(dirname -- "$0")/../load.sh" || exit 1
 require: git
 
+UPSTREAM=
 DEVELOP=develop
 FEATURE=wip/
 RELEASE=release-
 MAIN=master
+TAG_SUFFIX=
 HOTFIX=hotfix-
 DIST=
-source "$MYDIR/${MYNAME%.sh}.conf"
+source "$MYDIR/pman${MYNAME#_rel}.conf"
 
 function init_action() {
     :
@@ -33,8 +35,9 @@ args=(
     -o:,--remote Remote= "++spécifier le remote vers lequel pousser les branches"
     --init action=init "++initialiser les branches $DEVELOP et $MAIN"
     --list action=list "lister les modifications qui seraient intégrées dans la release"
-    -r,--release action=release "faire la release"
+    -g,--release action=release "faire la release"
     -v:,--version Version= "spécifier la version de la release"
+    -m,--merge Merge=1 "merger la branche de release après l'avoir créée"
 )
 parse_args "$@"; set -- "${args[@]}"
 
@@ -45,6 +48,7 @@ fi
 git_check_gitvcs || die "$(ppath "$(pwd)" ~): ce répertoire n'est pas un dépôt git"
 setx branch=git_get_branch
 case "$branch" in
+"$UPSTREAM") current=upstream;;
 "$DEVELOP") current=develop;;
 "$FEATURE"*) current=feature;;
 "$RELEASE"*) current=release;;

wip/pman.conf

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
 
+# branche upload
+UPSTREAM=
 # branches de développement
 DEVELOP=develop
 FEATURE=wip/
@@ -7,6 +9,7 @@ FEATURE=wip/
 RELEASE=release-
 # branche de release
 MAIN=master
+TAG_SUFFIX=
 # branche de hotfix
 HOTFIX=hotfix-
 # branche de distribution

wip/pman74.conf

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
 
+UPSTREAM=
 DEVELOP=dev74
 FEATURE=wip74/
 RELEASE=rel74-
 MAIN=dist74
+TAG_SUFFIX=p74
 HOTFIX=hotf74-
 DIST=

wip/pman82.conf

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
 
+UPSTREAM=
 DEVELOP=dev82
 FEATURE=wip82/
 RELEASE=rel82-
 MAIN=dist82
+TAG_SUFFIX=p82
 HOTFIX=hotf82-
 DIST=