9

I have a pending changelist open with several integrated files. Is there a way to list where (perforce path and revision) these files were integrated from? I'd like to double check that they were integrate from the correct place before submitting.

Tolli
  • 362
  • 5
  • 12

2 Answers2

9

To list unresolved integrations, use 'p4 resolve -n'.

To list resolved but unsubmitted integrations, use 'p4 resolved'.

Since you mention you're getting ready to submit, you've probably already resolved the integrations, so use 'p4 resolved'.

Bryan Pendleton
  • 16,128
  • 3
  • 32
  • 56
  • Tolli doesn't seem to be asking about resolving files. – jamesdlin Feb 26 '14 at 04:18
  • 1
    'p4 resolved' is the correct command to get this information. All integrations require resolution; integrate is how you pick the files to open, but resolve does the hard work of deciding what the final content is. p4 resolve and p4 integrate are like chocolate and peanut butter; they belong together. – Matt Feb 26 '14 at 05:27
3

You can check if the file is a Lazy Copy (branched files are lazy copies). Run p4 fstat -Oc on the file and check the lbrFile output, it will show you from where this file was integrated.

Also take a look: http://answers.perforce.com/articles/KB_Article/How-to-Identify-a-Lazy-Copy-of-a-File

Bruno Brs
  • 673
  • 1
  • 6
  • 23