// impl need to raise when during Checkin or get latest conflict is found
 public void OnConflict(ConflictEventArgs e)
 {
     if (Conflict != null)
     {
         Conflict(e);
     }
 }
Exemple #2
0
        void importer_OnConflict(ConflictEventArgs args)
        {
            ConflictDialog dlg = new ConflictDialog(args.Message);

            dlg.ShowDialog();

            args.Decision = dlg.Decision;
            args.ForAll   = dlg.ForAll;
        }
 protected ItemStatus OnItemConflict(MetadataItem item)
 {
     if (ItemConflict != null)
     {
         var arg = new ConflictEventArgs(_configuration, item.DeepClone());
         ItemConflict(this, arg);
         return(arg.NewStatus);
     }
     return(ItemStatus.Conflict);
 }
 void importer_OnConflict(ConflictEventArgs args)
 {
     if (this.InvokeRequired)
     {
         this.Invoke(new Action(() => { ConflictDialogCreation(args); }));
     }
     else
     {
         ConflictDialogCreation(args);
     }
 }
        private void ConflictDialogCreation(ConflictEventArgs args)
        {
            if (singleConflictDialog == null)
            {
                singleConflictDialog = new ConflictDialog(args.Message);
            }
            else
            {
                singleConflictDialog.SetConflictDialog(args.Message);
            }

            singleConflictDialog.ShowDialog();
            args.Decision = singleConflictDialog.Decision;
            args.ForAll   = singleConflictDialog.ForAll;
        }
Exemple #6
0
 static void ConflictEventHandler(Object sender, ConflictEventArgs e)
 {
     Console.Error.WriteLine(e.Message);
 }
Exemple #7
0
 static void sync_ItemConflict(object sender, ConflictEventArgs e)
 {
     Console.WriteLine("CONFLICT: {0}", e.Item.Name);
 }
Exemple #8
0
 /// <summary>
 /// Handles the Conflict event of the versionControlServer control.
 /// </summary>
 /// <param name="sender">The source of the event.</param>
 /// <param name="e">The <see cref="Microsoft.TeamFoundation.VersionControl.Client.ConflictEventArgs"/> instance containing the event data.</param>
 /// <remarks>Documented by CFI, 2010-06-27</remarks>
 protected void versionControlServer_Conflict(object sender, ConflictEventArgs e)
 {
     MessageBox.Show("Conflict: " + e.Message);
 }
        private void manager_ItemConflict(object sender, ConflictEventArgs e)
        {
            e.NewStatus = OnConflict(e.Configuration, e.Item, e.NewStatus);

            Logger.Log("[{0}] [{3}] Conflict {1} - New Status: {2}", DateTime.Now, e.Item.Name, e.NewStatus, e.Configuration.Name);
        }
        private void manager_ItemConflict(object sender, ConflictEventArgs e)
        {
            e.NewStatus = OnConflict(e.Configuration, e.Item, e.NewStatus);

            SuperRocket.Orchard.Core.SharePoint.Common.Logger.Log("[{0}] [{3}] Conflict {1} - New Status: {2}", DateTime.Now, e.Item.Name, e.NewStatus, e.Configuration.Name);
        }
Exemple #11
0
 void VersionControlServer_Conflict(object sender, ConflictEventArgs e)
 {
     RefreshConflictsAsync();
 }