private void MergeForm_Shown(object sender, EventArgs e) { var result = Excel2Csv.BeginMerge(); if (result != "") { hasErrorOnLoad = true; MessageBox.Show(result, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); Close(); return; } //MergeEvtData.Multiply(100); RefreshDvData(); }
private void toolStripButton2_Click(object sender, EventArgs e) { foreach (var evtData in BaseMergeData.DataList) { if (evtData.Conflict) { MessageBox.Show("还有未处理的冲突,无法保存", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } } Excel2Csv.OnLastErrorSolved(); //行merge都在这里统一搞 Excel2Csv.Save(); hasSaved = true; toolStripButton2.Enabled = false; RunExeByProcess("svn.exe", "resolved " + ProArgs.Mine); MessageBox.Show("保存成功", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); }