From owner-p4-projects@FreeBSD.ORG Mon Jun 30 06:05:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA4E51065679; Mon, 30 Jun 2008 06:05: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 AC1781065676 for ; Mon, 30 Jun 2008 06:05:17 +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 9AFEE8FC28 for ; Mon, 30 Jun 2008 06:05:17 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5U65HKj094031 for ; Mon, 30 Jun 2008 06:05:17 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5U65HxT094029 for perforce@freebsd.org; Mon, 30 Jun 2008 06:05:17 GMT (envelope-from julian@freebsd.org) Date: Mon, 30 Jun 2008 06:05:17 GMT Message-Id: <200806300605.m5U65HxT094029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2008 06:05:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=144339 Change 144339 by julian@julian_trafmon1 on 2008/06/30 06:04:19 add -i to integ operation Affected files ... .. //depot/projects/vimage/update.sh#2 edit Differences ... ==== //depot/projects/vimage/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 ====="