PERFORCE change 142007 for review

[Julian Elischer]

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

Change 142007 by julian at julian_trafmon1 on 2008/05/22 01:23:19

	remove a deleted file and fix teh script so it will do it next time

Affected files ...

.. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_l2t.c#5 delete
.. //depot/projects/arp-v2/src/update.sh#2 edit

Differences ...

==== //depot/projects/arp-v2/src/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 -d -b ${BRANCH} @${CHNUM}
 echo
 echo "======================================================================="
 echo "===== Preparing to resolve simple integrations.. stand bye ====="