AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:<20090713132328.756a68a0@ripper.onstor.net>
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:mail.onstor.net
NSV:
SSH:
R:<larry.scheer@onstor.com>
MAID:1
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
RMID:#imap/andys@onstor.net@exch1.onstor.net/INBOX	0	102AB4F33EBBDB4C91915B145C8E9FB31377A3D4DE@exch1.onstor.net
X-Sylpheed-End-Special-Headers: 1
Date: Mon, 13 Jul 2009 13:24:15 -0700
From: Andrew Sharp <andy.sharp@onstor.com>
To: Larry Scheer <larry.scheer@onstor.com>
Subject: Re: integrate commands not working for me
Message-ID: <20090713132415.67538071@ripper.onstor.net>
In-Reply-To: <102AB4F33EBBDB4C91915B145C8E9FB31377A3D4DE@exch1.onstor.net>
References: <20090713112056.25713c53@ripper.onstor.net>
	<102AB4F33EBBDB4C91915B145C8E9FB31377A3D4DE@exch1.onstor.net>
Organization: Onstor
X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.8.20; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Yup, I had just sync'd both branches, and my client spec is:




Client:	ripper

Update:	2009/06/29 14:03:46

Access:	2009/07/13 11:26:07

Owner:	andys

Description:
	Created by andys.

Root:	/homes/andys

AltRoots:
	\\mightydog\Users\andys

Options:	noallwrite noclobber nocompress unlocked nomodtime
normdir

SubmitOptions:	revertunchanged

LineEnd:	local

View:
	//depot/... //ripper/src/...
	-//depot/dev/opensol/... //ripper/src/dev/opensol/...







On Mon, 13 Jul 2009 12:00:23 -0700 Larry Scheer
<larry.scheer@onstor.com> wrote:

> The command (with -n option) worked for me in my workspace.
> 
> Check the following:
> 
> 1. your client spec has both branches listed
> 2. you client workspace has both branches sync'd
> 
> 
> Here is what I saw when I ran the integrate command with the -n
> option:
> 
> [lscheer@larrys r402rel]$ p4 integrate -n
> -o //depot/dev/linux/kernel/linux-mips-2.6/arch/mips/...@31536,@31536 //depot/r402rel/linux/kernel/linux-mips-2.6/arch/mips/... //depot/r402rel/linux/kernel/linux-mips-2.6/arch/mips/kernel/setup.c#1
> - integrate
> from //depot/dev/linux/kernel/linux-mips-2.6/arch/mips/kernel/setup.c#2
> using
> base //depot/dev/linux/kernel/linux-mips-2.6/arch/mips/kernel/setup.c#1 //depot/r402rel/linux/kernel/linux-mips-2.6/arch/mips/onstor/cougar/prom.c#1
> - integrate
> from //depot/dev/linux/kernel/linux-mips-2.6/arch/mips/onstor/cougar/prom.c#4
> using
> base //depot/dev/linux/kernel/linux-mips-2.6/arch/mips/onstor/cougar/prom.c#3
> 
> -----Original Message-----
> From: Andy Sharp 
> Sent: Monday, July 13, 2009 11:21 AM
> To: Larry Scheer
> Subject: Re: integrate commands not working for me
> 
> Must have been a cut-n-paste error on my part.  Here's the orig:
> 
> ripper:~/src/r402rel$ p4 integrate
> -o //depot/dev/linux/kernel/linux-mips-2.6/arch/mips/...@31536,@31536 //depot/rel402/linux/kernel/linux-mips-2.6/arch/mips/... //depot/dev/linux/kernel/linux-mips-2.6/arch/mips/...@31536,@31536
> - no target file(s) in both client and branch view.
> 
> 
> On Mon, 13 Jul 2009 11:13:16 -0700 Larry Scheer
> <larry.scheer@onstor.com> wrote:
> 
> > I see two rel402 in the second path:
> >    /rel402/rel402/
> > 
> > That may be the problem.
> > 
> > ________________________________________
> > From: Andy Sharp
> > Sent: Monday, July 13, 2009 10:42 AM
> > To: Larry Scheer
> > Subject: integrate commands not working for me
> > 
> > Hi Larry,
> > 
> > Maybe you can make some sense of this.  When I try to execute the
> > integrate command:
> > 
> > p4 integrate
> > -o //depot/dev/linux/kernel/linux-mips-2.6/arch/mips/...@31536,@31536 //depot/rel402/rel402/linux/kernel/linux-mips-2.6/arch/mips/...
> > 
> > I get this error message:
> > 
> > //depot/dev/linux/kernel/linux-mips-2.6/arch/mips/...@31536,@31536 -
> > no target file(s) in both client and branch view.
> > 
> > 
> > WTF?  Am I doing something wrong here?  Seems OK to me.  Heck, it
> > was the gui (p4v) that came up with the commands in the first place.
> > 
> > Mystified and hung over,
> > 
> > a
