PERFORCE change 147866 for review

[Julian Elischer]

http://perforce.freebsd.org/chv.cgi?CH=147866

Change 147866 by julian at julian_trafmon1 on 2008/08/20 02:10:20

	Add the -i argumant to these

Affected files ...

.. //depot/projects/vimage-commit/update.sh#2 edit
.. //depot/projects/vimage-commit2/update.sh#2 edit
.. //depot/projects/vimage-commit3/update.sh#2 edit
.. //depot/projects/vimage-devel/update.sh#3 edit
.. //depot/projects/vimage/update.sh#3 edit

Differences ...

==== //depot/projects/vimage-commit/update.sh#2 (text+ko) ====

@@ -19,7 +19,7 @@
 echo    "============================================="
 echo -n "select the change number we want to sync to: "
 read CHNUM
-p4 integ -b ${BRANCH} @${CHNUM}
+p4 integ -i -b ${BRANCH} @${CHNUM}
 echo
 echo "======================================================================="
 echo "===== Preparing to resolve simple integrations.. stand bye ====="

==== //depot/projects/vimage-commit2/update.sh#2 (text+ko) ====

@@ -19,7 +19,7 @@
 echo    "============================================="
 echo -n "select the change number we want to sync to: "
 read CHNUM
-p4 integ -b ${BRANCH} @${CHNUM}
+p4 integ -i -b ${BRANCH} @${CHNUM}
 echo
 echo "======================================================================="
 echo "===== Preparing to resolve simple integrations.. stand bye ====="

==== //depot/projects/vimage-commit3/update.sh#2 (text+ko) ====

@@ -19,7 +19,7 @@
 echo    "============================================="
 echo -n "select the change number we want to sync to: "
 read CHNUM
-p4 integ -b ${BRANCH} @${CHNUM}
+p4 integ -i -b ${BRANCH} @${CHNUM}
 echo
 echo "======================================================================="
 echo "===== Preparing to resolve simple integrations.. stand bye ====="

==== //depot/projects/vimage-devel/update.sh#3 (text+ko) ====


==== //depot/projects/vimage/update.sh#3 (text+ko) ====