Jason - thanks for the help, but I'm still struggling with this.  What would be the format of a diff file with all of the lines as adds?  I'm trying to merge my p4 diff output, with some scripting that I'm doing to show all of the new files as +, but I can't get it to work.

The p4 diff produces an output that starts like this:

==== //DTSource/main/itm/src/java/com/demandtec/itm/bo/ItmEjbBase.java#1 - c:\Documents and Settings\tfenster\main\itm\src\java\com\demandtec\itm\bo\ItmEjbBase.java ====

@@ -16,7 +16,6 @@

gnu diff appears to produce this type of output:

--- c:/empty.txt  2005-07-08 10:51:12.013096500 -0700

+++ c:/Documents and Settings/tfenster/main/itm/src/java/com/demandtec/itm/bo/NewFile.java      2005-06-28 16:13:04.918980600 -0700

@@ -0,0 +1,280 @@

 

And I have not been able to successfully merge the two.

Thanks again for the help.

 

Tom Fenstermacher | Senior Director, Engineering

DemandTec, Inc. | 1 Circle Star Way, Suite 200 | San Carlos, CA 94070

tel | +1.650.226.4628 cell | +1.650.814.4062 fax | +1.650.556.1190

www.demandtec.com

 

 

-----Original Message-----
From: Jason Remillard [mailto:[EMAIL PROTECTED]
Sent: Friday, July 08, 2005 10:38 AM
To: Tom Fenstermacher; codestriker-user@lists.sourceforge.net
Subject: Re: [Codestriker-user] code reviewing new files

 

Hi,

 

I have not used perforce before, so I don't know of any tricks to get the perforce diff to do

this.

 

With the gnu diff, there is an option -N

 

       -N  --new-file

              Treat absent files as empty.

 

I looked up the perforce docs on its diff command and I did not see an equivalent. On clearcase, I

wrote a script that gets a list of the checked out and added files. The script then manually runs

the gnu diff over each file comparing it to the version that is checked in. In clearcase it is

pretty easy to do this because you can pull out older versions directly with a @@version name at

the end of the file name. If you can make a diff file that has all lines as adds, then codestriker

will show it as a new file. Perhaps you could do the same thing. Get a list of the new files, then

diff them using the perforce diff against an empty file. Con cat the output into a single diff

file.

 

Thanks

Jason

 

--- Tom Fenstermacher <[EMAIL PROTECTED]> wrote:

 

>

> Let me first start by saying that codestriker is an awesome tool.  Many

> thanks to David and anyone else who has contributed to making it some

> helpful.

>

> This tool has been very effective to enable the tracking of changes to

> existing files (i.e. 1 version already in source control), especially

> given it's integration with p4 and bugzilla (both of which we use).  One

> thing that I have not been able to figure out is: how can I include

> "new" files (i.e. file only exists on client, and have run p4 add) into

> the code review process?  I have a little script that the users run on a

> p4 changelist, which produces the diffs (between the client and the

> depot), but the output of this does not include any information about

> new files.  When performing a code review, reviewers will need to be

> able to see all of the code in order to adequately understand the logic.

>

> I'm hoping that I am missing something easy here, so I just wanted to

> check with you.

> Thanks again for the help.

> Tom

>

> Tom Fenstermacher | Senior Director, Engineering

> DemandTec, Inc. | 1 Circle Star Way, Suite 200 | San Carlos, CA 94070

> tel | +1.650.226.4628 cell | +1.650.814.4062 fax | +1.650.556.1190

> www.demandtec.com

>

>

>

>

> <html>

> <body>

>   <span

>

style="font-size:8.0pt;font-family:Arial">---------------------------------------------------------------------------------------------------------------------------------------------</span>

>   <span style="font-size:8.0pt;font-family:Arial">DEMANDTEC EMAIL NOTICE:</span>

>   <p><span style="font-size:8.0pt;font-family:Arial">NOTICE: This email transmission and all

> attached files contain information intended for the designated individual or entity to whom it

> is addressed and may contain information that is proprietary, privileged and/or exempt from

> disclosure under applicable law.  If you are not the intended recipient or an employee or agent

> responsible for delivering this message to the intended recipient, you are hereby notified that

> any dissemination, distribution, copying,  or other use of this email or its attachments is

> strictly prohibited.  If you have received this email in error, please notify the sender

> immediately by replying to this message and please delete the original message without making

> any copies.</span>

>   <p><span style="font-size:8.0pt;font-family:Arial">WARNING: Computer viruses can be

> transmitted via email.  The recipient should check this email and any attachments for the

> presence of viruses.  Although we have taken reasonable precautions to ensure that this email

> and all attachments are free from viruses, we accept no liability for any loss or damage arising

> from the use of this email or its attachments.</span>

> </body>

> </html>

 

 

           

__________________________________

Discover Yahoo!

Find restaurants, movies, travel and more fun for the weekend. Check it out!

http://discover.yahoo.com/weekend.html

 

Reply via email to