Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Added column to indicate that changes need to be merged

Browse Source
This commit is contained in:
Rich 2012-11-13 21:29:53 +00:00
parent fbb5023132
commit e977521519
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PROMS/Sync/Sync/FileCompare.cs
View File

@ -51,6 +51,12 @@ namespace Sync
{ {
get { return _ReadOnly; } get { return _ReadOnly; }
} }
private bool _Merge = false;
public bool Merge
{
get { return _Merge; }
set { _Merge = value; }
}
public FileCompare(FileInfo development, FileInfo sourceSafe) public FileCompare(FileInfo development, FileInfo sourceSafe)
{ {
_Developement = development; _Developement = development;

5
PROMS/Sync/Sync/frmSync.cs
View File

@ -144,8 +144,11 @@ namespace Sync
private void AddToResults(FileInfo fiSS,FileInfo fiDev) private void AddToResults(FileInfo fiSS,FileInfo fiDev)
{ {
FileCompare fc = new FileCompare(fiDev, fiSS); FileCompare fc = new FileCompare(fiDev, fiSS);
FileInfo fiMB = new FileInfo(fc.FileName.Replace(tbDevelopment.Text, tbSSMailBox.Text));
if (fiMB.Exists && fiSS.LastWriteTimeUtc != fiMB.LastWriteTimeUtc)
fc.Merge = true;
//if(!_OnlyContentDifferent || (fc.Different && (fc.DevModified != null))) //if(!_OnlyContentDifferent || (fc.Different && (fc.DevModified != null)))
if (!_OnlyContentDifferent || (fc.Different)) if (!_OnlyContentDifferent || (fc.Different))
_CheckedOut.Add(fc); _CheckedOut.Add(fc);
//if (tbResults.Text == "") tbResults.Text = "Found:"; //if (tbResults.Text == "") tbResults.Text = "Found:";
//tbResults.Text += "\r\n" + fiDev.FullName + " - " + ((fiDev.Attributes & FileAttributes.ReadOnly) != FileAttributes.ReadOnly ? "" : "ReadOnly"); //tbResults.Text += "\r\n" + fiDev.FullName + " - " + ((fiDev.Attributes & FileAttributes.ReadOnly) != FileAttributes.ReadOnly ? "" : "ReadOnly");