From 2cb032d0d471ecb558a0e9844fdca2f5c4faed0b Mon Sep 17 00:00:00 2001
From: nathan <nathan>
Date: Thu, 9 Aug 2007 14:59:48 +0000
Subject: [PATCH] i=scjody include new dirs when landing/replacing

---
 build/land1.sh    | 2 +-
 build/replace1.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/land1.sh b/build/land1.sh
index ef875e64b2..c21f3b9901 100755
--- a/build/land1.sh
+++ b/build/land1.sh
@@ -102,7 +102,7 @@ echo "done"
 
 # Apply all of the changes to your local tree:
 echo -n "Updating as -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date ..."
-$CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date $dir
+$CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date -dP $dir
 echo "done"
 
 echo -n "Recording conflicts in $CONFLICTS ..."
diff --git a/build/replace1.sh b/build/replace1.sh
index cb0c6889da..51570f507a 100755
--- a/build/replace1.sh
+++ b/build/replace1.sh
@@ -16,7 +16,7 @@ if [ -f $CONFLICTS ] ; then
 fi
 
 if [ $# -lt 2 -o $# -gt 3 ]; then
-    echo "This is phase 1 of replacing branches. Usage: $0 parent(old) child(new) [dir]"
+    echo "This is phase 1 of replacing branches. Run this in the PARENT tree. Usage: $0 parent(will be replaced) child(will become the new parent) [dir]"
     exit
 fi
 
@@ -105,7 +105,7 @@ echo "done"
 
 # Apply all of the changes to your local tree:
 echo -n "Updating as -j $parent -j $child ..."
-$CVS update -j $parent -j $child $dir
+$CVS update -j $parent -j $child -dP $dir
 echo "done"
 
 echo -n "Recording conflicts in $CONFLICTS ..."
-- 
GitLab