From owner-p4-projects@FreeBSD.ORG  Wed Aug 20 02:11:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0087A1065680; Wed, 20 Aug 2008 02:11:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B8561106567A
	for <perforce@freebsd.org>; Wed, 20 Aug 2008 02:11:16 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A8C1C8FC32
	for <perforce@freebsd.org>; Wed, 20 Aug 2008 02:11:16 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7K2BGG9063559
	for <perforce@freebsd.org>; Wed, 20 Aug 2008 02:11:16 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7K2BGi0063557
	for perforce@freebsd.org; Wed, 20 Aug 2008 02:11:16 GMT
	(envelope-from julian@freebsd.org)
Date: Wed, 20 Aug 2008 02:11:16 GMT
Message-Id: <200808200211.m7K2BGi0063557@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 147866 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Aug 2008 02:11:17 -0000

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

Change 147866 by julian@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) ====