Index: cvsclosebranch
===================================================================
RCS file: /cvs/src/src/winsup/maint/cvsclosebranch,v
retrieving revision 1.1
diff -u -r1.1 cvsclosebranch
--- cvsclosebranch	24 Sep 2001 23:15:50 -0000	1.1
+++ cvsclosebranch	18 Jun 2002 21:51:14 -0000
@@ -50,6 +50,7 @@
 	ecvs -q rtag -r "$localtag" $tag $module || true
 	mergetag="$mergetag2"
     else
+	exec >&2
 	echo "ERROR: There are remains in the branch. Cannot close without"
 	echo "       a tag name for the remains"
 	exit 1
Index: cvsmerge
===================================================================
RCS file: /cvs/src/src/winsup/maint/cvsmerge,v
retrieving revision 1.1
diff -u -r1.1 cvsmerge
--- cvsmerge	24 Sep 2001 23:15:50 -0000	1.1
+++ cvsmerge	18 Jun 2002 21:51:14 -0000
@@ -1,10 +1,12 @@
 #!/bin/sh -e
 if [ $# -ne 1 ]; then
+   exec >&2
    echo "Usage: $0 merge-from"
    echo "    where merge-from is the branch you want to merge changes from"
    exit 1
 fi
 if [ ! -f CVS/Root ] || [ ! -f CVS/Repository ]; then
+    exec >&2
     echo "ERROR: The script must be run from a CVS working directory"
     exit 1
 fi
@@ -39,6 +41,7 @@
 o Make sure there is no pending changes in the working directory
 diffl=`ecvs -z9 -q diff -kk | grep -v '^\?' | wc -l`
 if [ $diffl -ne 0 ]; then
+    exec >&2
     echo "ERROR: You must first commit any pending changes"
     exit 1
 fi
Index: cvsmergeinit
===================================================================
RCS file: /cvs/src/src/winsup/maint/cvsmergeinit,v
retrieving revision 1.1
diff -u -r1.1 cvsmergeinit
--- cvsmergeinit	24 Sep 2001 23:15:50 -0000	1.1
+++ cvsmergeinit	18 Jun 2002 21:51:14 -0000
@@ -1,5 +1,6 @@
 #!/bin/sh -e
 if [ $# -ne 2 -a $# -ne 1 ]; then
+   exec >&2
    cat <<- EOF
 	usage: $0 merge_from_tag [based_on_tag]
 	merge_from_tag is the tag to track in this tree
Index: cvsmkbranch
===================================================================
RCS file: /cvs/src/src/winsup/maint/cvsmkbranch,v
retrieving revision 1.1
diff -u -r1.1 cvsmkbranch
--- cvsmkbranch	24 Sep 2001 23:15:50 -0000	1.1
+++ cvsmkbranch	18 Jun 2002 21:51:14 -0000
@@ -1,5 +1,6 @@
 #!/bin/sh -e
 if [ $# -ne 1 ] || [ ! -f CVS/Repository ]; then
+    exec >&2
     echo "Usage: $0 branchname"
     echo ""
     echo "Creates a new branch from the current working directory"
@@ -16,6 +17,7 @@
 branch=`echo $1|sed -e 's/\./_/g'`
 workdir=../`echo $branch|sed -e's/_/./g'`
 if [ -d ../$workdir ]; then
+   exec >&2
    echo "Error! ../$workdir already exists"
    exit 1
 fi
Index: cvsmkpatch
===================================================================
RCS file: /cvs/src/src/winsup/maint/cvsmkpatch,v
retrieving revision 1.1
diff -u -r1.1 cvsmkpatch
--- cvsmkpatch	24 Sep 2001 23:15:50 -0000	1.1
+++ cvsmkpatch	18 Jun 2002 21:51:14 -0000
@@ -1,17 +1,20 @@
 #!/bin/bash -e
 if [ $# -ne 1 ]; then
+   exec >&2
    echo "Usage: $0 base-tag"
    echo "    where base-tag is the base branch the diff should start from"
    echo "    (usually HEAD, but you should know...)"
    exit 1
 fi
 if [ ! -f CVS/Root ] || [ ! -f CVS/Repository ]; then
+    exec >&2
     echo "ERROR: The script must be run from a CVS working directory"
     exit 1
 fi
 if [ -f CVS/Tag ]; then
     localtag=`cat CVS/Tag|cut -c2-`
 else
+    exec >&2
     echo "ERROR: The script can only be run from branches. Running"
     echo "it from the HEAD version does not make sense."
     exit 1