[This is preliminary documentation and is subject to change.]
Namespace: Perforce.P4Assembly: p4api.net (in p4api.net.dll) Version: 2012.2.63.1250 (2012.2.63.1250)
Syntax
C# |
---|
public List<FileResolveRecord> GetResolvedFiles( Options options, params FileSpec[] files ) |
Visual Basic |
---|
Public Function GetResolvedFiles ( _ options As Options, _ ParamArray files As FileSpec() _ ) As List(Of FileResolveRecord) |
Visual C++ |
---|
public: List<FileResolveRecord^>^ GetResolvedFiles( Options^ options, ... array<FileSpec^>^ files ) |
Return Value
Remarks
p4 help resolved
resolved -- Show files that have been resolved but not submitted
p4 resolved [-o] [file ...]
'p4 resolved' lists file updates and integrations that have been
resolved but not yet submitted. To see unresolved integrations,
use 'p4 resolve -n'. To see already submitted integrations, use
'p4 integrated'.
If a depot file path is specified, the output lists resolves for
'theirs' files that match the specified path. If a client file
path is specified, the output lists resolves for 'yours' files
that match the specified path.
The -o flag reports the revision used as the base during the
resolve.