From owner-p4-projects@FreeBSD.ORG  Thu May 28 17:42:41 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 98D9C10656C6; Thu, 28 May 2009 17:42:41 +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 5371010656C0
	for <perforce@freebsd.org>; Thu, 28 May 2009 17:42:41 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 27B6F8FC08
	for <perforce@freebsd.org>; Thu, 28 May 2009 17:42:41 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SHgfNU075582
	for <perforce@freebsd.org>; Thu, 28 May 2009 17:42:41 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SHgftQ075580
	for perforce@freebsd.org; Thu, 28 May 2009 17:42:41 GMT
	(envelope-from zec@fer.hr)
Date: Thu, 28 May 2009 17:42:41 GMT
Message-Id: <200905281742.n4SHgftQ075580@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 162953 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: Thu, 28 May 2009 17:42:43 -0000

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

Change 162953 by zec@zec_amdx4 on 2009/05/28 17:41:41

	Add the -d flag to p4 integrate

Affected files ...

.. //depot/projects/vimage-commit/update.sh#3 edit

Differences ...

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

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