private void AADiffTargetVsMergedMI_Click(object sender, EventArgs e)
{
if (sourceFile == null)
{
sourceFile = new TempFile();
if (Scm.GetFileVersion(sourceFile, _selectedItem.ResolveRecord.FromFileSpec) == null)
{
return;
}
}
if (baseFile == null)
{
baseFile = new TempFile();
if (Scm.GetFileVersion(baseFile, _selectedItem.ResolveRecord.BaseFileSpec) == null)
{
return;
}
}
string targetFile = _selectedItem.ResolveRecord.LocalFilePath.Path;
if (mergedFile == null)
{
mergedFile = new TempFile();
if (Scm.MergeLocalFiles(baseFile, sourceFile, targetFile, mergedFile) == false)
{
return;
}
}
Scm.Diff2Files(targetFile,
string.Format(Resources.ResolveFileInteractiveControl_TargetFile, targetFile),
mergedFile,
Resources.ResolveFileInteractiveControl_MergedSourceTarget);
}
private void AADiffBaseVsMergedMI_Click(object sender, EventArgs e)
{
if (sourceFile == null)
{
sourceFile = new TempFile();
if (Scm.GetFileVersion(sourceFile, _selectedItem.ResolveRecord.FromFileSpec) == null)
{
return;
}
}
if (baseFile == null)
{
baseFile = new TempFile();
if (Scm.GetFileVersion(baseFile, _selectedItem.ResolveRecord.BaseFileSpec) == null)
{
return;
}
}
string targetFile = _selectedItem.ResolveRecord.LocalFilePath.Path;
if (mergedFile == null)
{
mergedFile = new TempFile();
if (Scm.MergeLocalFiles(baseFile, sourceFile, targetFile, mergedFile) == false)
{
return;
}
}
Scm.Diff2Files(baseFile,
string.Format("Base ({0})", baseFile.ToString()),
mergedFile,
"Merged Source/Target");
}
