changeset 49:f68307dcf350

Warning if need merge.
author Oleksander Gavenko <gavenko_a@3g.ua>
date Sun, 23 Mar 2008 15:18:09 +0200
parents df490bd7aeb9
children 32c034b3e55d
files hg/hgsyncee hg/hgsyncew
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/hg/hgsyncee	Sun Mar 23 15:10:12 2008 +0200
+++ b/hg/hgsyncee	Sun Mar 23 15:18:09 2008 +0200
@@ -20,7 +20,7 @@
         MSG_SIGN=ERROR
     else
         case $1 in
-            ERROR|INFO) MSG_SIGN=$1 ;;
+            ERROR|INFO|WARNING) MSG_SIGN=$1 ;;
             *) exit 1 ;;
         esac
     fi
@@ -189,9 +189,9 @@
         # для их доступности из промежуточного репозитория на другом рабочем месте.
         *)
             MSG="You must manually merge '$dir' proj and repeat run $UTIL_NAME."
-            PrintLog INFO
+            PrintLog WARNING
             MSG="Go to $HG_PULL_DIR/$dir."
-            PrintLog INFO
+            PrintLog WARNING
             hg -R $HG_PUSH_DIR/$dir push -f ./$dir >>$LOG_FILE 2>&1
             ;;
     esac
--- a/hg/hgsyncew	Sun Mar 23 15:10:12 2008 +0200
+++ b/hg/hgsyncew	Sun Mar 23 15:18:09 2008 +0200
@@ -24,7 +24,7 @@
         MSG_SIGN=ERROR
     else
         case $1 in
-            ERROR|INFO) MSG_SIGN=$1 ;;
+            ERROR|INFO|WARNING) MSG_SIGN=$1 ;;
             *) exit 1 ;;
         esac
     fi
@@ -181,8 +181,10 @@
                 esac
                 ;;
             *)
-                MSG="You must manually merge $dir rep."
-                PrintLog INFO
+                MSG="You must manually merge '$dir' proj and repeat run $UTIL_NAME."
+                PrintLog WARNING
+                MSG="Go to ./$dir."
+                PrintLog WARNING
                 ;;
         esac
     fi