diff --git a/build/land1.sh b/build/land1.sh index ef875e64b2a62c94c7582ee0ddb9a48d0c448caa..c21f3b9901222b77a69cdef874ad01cdef22239e 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 cb0c6889dabf29e058422c81cae088d93ad61519..51570f507ad9161a02b85bca3af78e35ec9dd3c1 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 ..."