From 3a38f5a5d439d106583051f9e3affff73fe981d9 Mon Sep 17 00:00:00 2001
From: nathan <nathan>
Date: Sat, 10 Feb 2007 00:16:55 +0000
Subject: [PATCH] a couple of little improvements
---
build/replace1.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/build/replace1.sh b/build/replace1.sh
index cff259047b..c7ab760cca 100755
--- a/build/replace1.sh
+++ b/build/replace1.sh
@@ -109,12 +109,14 @@ $CVS update -j $parent -j $child $dir
echo "done"
echo -n "Recording conflicts in $CONFLICTS ..."
-$CVS update | awk '/^C/ { print $2 }' > $CONFLICTS
+$CVS update $dir | awk '/^C/ { print $2 }' > $CONFLICTS
if [ -s $CONFLICTS ] ; then
echo "Conflicts found, fix before committing."
cat $CONFLICTS
fi
+echo "done"
+echo -n "Verifying that there are no diffs from $child ..."
$CVS diff --brief -r $child $dir >> $CONFLICTS
if [ -s $CONFLICTS ] ; then
echo "Danger! The child branch $CHILD differs from the updated branch $dir"
@@ -123,7 +125,6 @@ else
echo "No conflicts found"
rm -f $CONFLICTS
fi
-
echo "done"
echo "Build, test, commit and then run replace2.sh (no arguments)"
--
GitLab