[p4] integ / delete / integ-again question

[Rick Macdonald]

Look at "p4 help integ" or the reference manual:

The -d flag enables integrations around deleted revisions.

If the target file has been deleted and the source file changed, using 
-d re-branches the source file on top of the target file.

If the source file has been deleted and the target file has changed, 
using -d deletes the target file.

If the source file has been deleted and re-added, using -d integrates 
all outstanding revisions of the file, including those revisions prior 
to the file's deletion.

If you do not use the -d flag, outstanding edits may not be mixed with a 
deleted file.

...RickM...

Gross, Steve wrote:
> Here's a weird situation I ran into:
>
>  
>
> (1) I integrated a file from one place to another:
>
>  
>
> p4 integ //depot/source/foo //depot/target/foo
>
>  
>
> (2) I deleted the file in the target directory
>
>  
>
> p4 delete //depot/target/foo
>
>  
>
> (3) Then I wanted to integrate the file back into the target directory:
>
>  
>
> p4 integ //depot/source/foo //depot/target/foo
>
>  
>
> But I got an error saying: "//depot/target/foo - all revision(s) already
> integrated."
>
>  
>
> Did I do something wrong? Is there a way to make this work?
>
>  
>
> Thanks,
>
> --Steve (sgross at sjm.com)
>
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
>