# The form data below was edited by norman_morse
# Perforce Workshop Jobs
#
# Job: The job name. 'new' generates a sequenced job number.
# Status: Job status; [open/closed/suspended]. Required
# Project: The project this job is for. Required.
# Severity: [A/B/C] (A is highest) Required.
# ReportedBy The user who created the job. Can be changed.
# ReportedDate: The date the job was created. Automatic.
# ModifiedBy: The user who last modified this job. Automatic.
# ModifiedDate: The date this job was last modified. Automatic.
# OwnedBy: The owner, responsible for doing the job. Optional.
# Description: Description of the job. Required.
# DevNotes: Developer's comments. Optional.
# Type: Type of job; [Bug/Feature]. Required.
Job: job000421
Status: open
Project: perforce-software-p4api-net
Severity: B
ReportedBy: norman_morse
ReportedDate: 2015/12/09 10:02:30
ModifiedBy: norman_morse
ModifiedDate: 2015/12/09 10:02:30
Description:
NullReferenceException in concurrent file resolve
From internal case 00212695
I have a file that needs resolve, and it has conflicts so it's not resolvable automatically (e.g. calling "p4 resolve -am" will say there are conflicts and "resolve skipped.").
Now, in the command-line I run "p4 resolve FILE". That prompts me about how I want to resolve:
$ p4 resolve //depot/Foo
c:\some_path\Foo - merging //depot/Foo#7,#8
Diff chunks: 0 yours + 0 theirs + 1 both + 1 conflicting
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) e:
While I remain in this prompt (i.e. I leave the resolve incomplete), I run the following code:
var resp = r.Connection.Client.ResolveFiles(
new[]
{
new FileSpec(new DepotPath("//depot/Foo"), null)
},
new ResolveCmdOptions(ResolveFilesCmdFlags.AutomaticMergeMode, -1));
This throws a NullReferenceException, which is not very helpful. I guess the file is somehow locked at the server (the server knows there's an incomplete resolution in my p4.exe cmdline) but the exception could be more informative.
In contrast, when I attempt to resolve the file in P4V (right-click Foo, choose Resolve), it blocks: the progress bar in the bottom-right corner shows blue running squares, something is obviously going on, but the "Resolve" dialog doesn't come up until I've completed the p4.exe resolve one way or another.
DevNotes:
Type: Bug