X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Freplace1.sh;h=51570f507ad9161a02b85bca3af78e35ec9dd3c1;hb=5319b7a1ec96abf964cc74b90e41b783cba371aa;hp=c7ab760cca76e64538cc305aba709e02ca01c889;hpb=3a38f5a5d439d106583051f9e3affff73fe981d9;p=fs%2Flustre-release.git

diff --git a/build/replace1.sh b/build/replace1.sh
index c7ab760..51570f5 100755
--- a/build/replace1.sh
+++ b/build/replace1.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e 
+#!/bin/bash -e 
 
 progname=${0##*/}
 
@@ -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 ..."