conflict_resolution
stringlengths
27
16k
<<<<<<< var encodeLogger = StaticResolver.Resolve<AppLoggerFactory>().ResolveEncodeLogger(job.FinalOutputPath); jobViewModel.Logger = encodeLogger; ======= var encodeLogger = new AppLogger(this.logger, Path.GetFileName(job.FinalOutputPath)); jobViewModel.EncodeLogger = encodeLogger; >>>>>>> var encode...
<<<<<<< this.StartCopyImpl(this.attributes, sourceSnapshot, default(string) /* contentMD5 */, true /*incrementalCopy */, false /* syncCopy */, default(PremiumPageBlobTier?) /* premiumPageBlobTier */, default(StandardBlobTier?) /* standardBlockBlobTier */, default(RehydratePriority?) /* rehydratePriority...
<<<<<<< // We should always call AsStreamForWrite with bufferSize=0 to prevent buffering. Our // stream copier only writes 64K buffers at a time anyway, so no buffering is needed. await sourceAsStream.WriteToAsync(fileStream, length, null /* maxLength */, false, tempExecu...
<<<<<<< /// <summary> /// Constructs a web request to set the tier on a page blob. /// </summary> /// <param name="uri">The absolute URI to the blob.</param> /// <param name="timeout">The server timeout interval.</param> /// <param name="blobTier">The blob tier to set.</...
<<<<<<< ======= internal static IReadOnlyList<Type> GetAsyncDomainEventSubscriberSubscriptionTypes(this Type type) { //TODO //Check generic arguments for sanity //add checks for iaggregateroot //add checks for iidentity //add checks...
<<<<<<< public partial class HDRenderPipeline : RenderPipeline ======= public class GBufferManager { public const int k_MaxGbuffer = 8; public int gbufferCount { get; set; } RenderTargetIdentifier[] m_ColorMRTs; RenderTargetIdentifier[] m_RTIDs = new RenderTargetIdentifie...
<<<<<<< internal async Task UploadFromStreamAsyncHelper(Stream source, long? length, PremiumPageBlobTier? premiumPageBlobTier, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken) ======= internal Task UploadFromStreamAsyn...
<<<<<<< if (myUpdate.RemovedAlteredAttributes != null) { #region remove each attribute, which is no longer defined on type (f.e. after a alter type) foreach (var attribute in myUpdate.RemovedAlteredAttributes) { switch (attribu...
<<<<<<< public virtual Task<IEnumerable<string>> EnumerateVersions(PackageURL purl) { throw new NotImplementedException("BaseProjectManager does not implement EnumerateVersions."); } ======= abstract public Task<IEnumerable<string>> EnumerateVersions(PackageURL p...
<<<<<<< private System.Windows.Forms.Button openButton; private System.Windows.Forms.Button saveButton; private ShortcutListItem[] shortcutListItems; ======= >>>>>>> private System.Windows.Forms.Button openButton; private System.Windows.Forms.Button saveButton; <<<<<<< ...
<<<<<<< Int32 end = item.ToolTipText.IndexOfOrdinal(" ("); String keytext = view ? " (" + DataConverter.KeysToString(keys) + ")" : String.Empty; if (end != -1) item.ToolTipText = item.ToolTipText.Substring(0, end) + keytext; else item.ToolTipText = item.To...
<<<<<<< } /// <summary> /// Is the vertical scroll bar visible? /// </summary> public bool IsVScrollBar { get { return SPerform(2281, 0, 0) != 0; } set { SPerform(2280, value ...
<<<<<<< ======= /// <summary> /// Checks if a file name matches a search filter mask, eg: filename.jpg matches f*.jpg /// </summary> /// <param name="fileName">The name of the file to check</param> /// <param name="filterMask">The search filter to apply. You can use multiple ma...
<<<<<<< if (!aPath.IsValid || aPath.Updating) continue; string path = Path.Combine(aPath.Path, package); if (!aPath.IsValid || !Directory.Exists(path)) continue; renamePackagePath = path; StartRename(inline, Path.GetFile...
<<<<<<< using ASCompletion.Completion; ======= using ASCompletion.Helpers; >>>>>>> using ASCompletion.Completion; using ASCompletion.Helpers;
<<<<<<< this.openButton.Text = TextHelper.GetString("Label.Open"); this.saveButton.Text = TextHelper.GetString("Label.SaveAs"); this.searchLabel.Text = TextHelper.GetString("Label.Search").Replace("&", "") + ":"; ======= this.viewCustom.Text = TextHelper.GetString("Labe...
<<<<<<< const string ViewConflictsKey = "?"; const string ViewCustomKey = "*"; ======= private Timer updateTimer; >>>>>>> const string ViewConflictsKey = "?"; const string ViewCustomKey = "*"; private Timer updateTimer; <<<<<<< if (String.IsN...
<<<<<<< using CodeRefactor.Commands; using PluginCore; using PluginCore.FRService; ======= using PluginCore; using PluginCore.Localization; >>>>>>> using CodeRefactor.Commands; using PluginCore; using PluginCore.FRService; <<<<<<< currentCommand.OnRefactorComplete -= OnRefactorComplete; if (...
<<<<<<< /// <returns>Local vars dictionary (name, type)</returns> static public MemberList ParseLocalVars(ASExpr expression) ======= /// <returns>Local vars dictionnary (name, type)</returns> public static MemberList ParseLocalVars(ASExpr expression) >>>>>>> /// <returns>Local...
<<<<<<< string blobTierString = null; string rehydrationStatusString = null; ======= string premiumPageBlobTierString = null; >>>>>>> string blobTierString = null; string rehydrationStatusString = null; <<<<<<< ca...
<<<<<<< public class Slide : SentakkiLanedHitObject, IHasDuration ======= // This is the main object used to summon slides, includes a TAP and one or more "SlideBodies" public class Slide : SentakkiHitObject >>>>>>> public class Slide : SentakkiLanedHitObject <<<<<<< Progress = (...
<<<<<<< .SetBasePath(appEnv.ApplicationBasePath) .AddJsonFile(source => { source.Path = "appsettings.json"; source.ReloadOnChange = true; }) ======= .SetBasePath(env.ContentRootPath) ...
<<<<<<< using System; using System.Collections.Generic; using System.Linq; using System.Text; using Eto.Forms; using sw = System.Windows; using swc = System.Windows.Controls; using swm = System.Windows.Media; using swi = System.Windows.Input; using Eto.Platform.Wpf.Drawing; namespace Eto.Platform.Wpf.Forms.Menu { pu...
<<<<<<< g.Add <IBitmap> (() => new BitmapHandler ()); g.Add <IFontFamily> (() => new FontFamilyHandler ()); g.Add <IFont> (() => new FontHandler ()); g.Add <IFonts> (() => new FontsHandler ()); g.Add <IGraphics> (() => new GraphicsHandler ()); g.Add <IGraphicsPath> (() => new GraphicsPathHandler ()); ...
<<<<<<< using System; using System.Collections.Generic; #if XAML using System.Windows.Markup; #endif using System.Collections.Specialized; namespace Eto.Forms { public interface ITreeItem : IImageListItem, ITreeStore, ITreeItem<ITreeItem> { /// <summary> /// Used only by the back-ends, maps to a Tree...
<<<<<<< public int Width { get { return 0;/* TODO */ } } public int Height { get { return 0;/* TODO */ } } ======= public abstract UIImage GetUIImage (); >>>>>>> public abstract UIImage GetUIImage (); public int Width { get { return 0;/* TODO */ } } public int Height { get...
<<<<<<< await this.DownloadToStreamAsync(stream, accessCondition, options, operationContext, cancellationToken).ConfigureAwait(false); ======= using (stream) { await this.DownloadToStreamAsync(stream, accessCondition, options, operati...
<<<<<<< Control.AddLines (new SD.PointF[] { Generator.ConvertF (point1), Generator.ConvertF (point2) }); ======= Control.AddLines (new sd.PointF[] { point1.ToSDPointF (), point2.ToSDPointF () }); >>>>>>> Control.AddLines (new SD.PointF[] { point1.ToSDPointF (), point2.ToSDPointF () });
<<<<<<< this.StartCopyImpl(this.attributes, sourceSnapshotUri, default(string) /* contentMD5 */, true /* incrementalCopy */, false /* syncCopy */, default(PremiumPageBlobTier?) /* premiumPageBlobTier */, default(StandardBlobTier?) /* standardBlockBlobTier */, default(RehydratePriority?) /* rehydratePrio...
<<<<<<< public static StorageRequestMessage AppendBlock(Uri uri, Uri sourceUri, long? offset, long? count, string sourceContentMd5, int? timeout, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonic...
<<<<<<< public string Text { get { return ""; } set { ; } } ======= public Color TextColor { get { return Control.Foreground.ToEtoColor(); } set { Control.Foreground = value.ToWpfBrush(Control.Foreground); } } >>>>>>> public string Text { get { return ""; } set { ; } } public...
<<<<<<< /// Header that specifies file permission. /// </summary> public const string FilePermission = PrefixForStorageHeader + "file-permission"; /// <summary> /// Default header value for file permission. /// </summary> public const ...
<<<<<<< return this.StartCopy(source, default(string) /* contentMD5 */, false /* syncCopy */, standardBlockBlobTier, rehydratePriority, sourceAccessCondition, destAccessCondition, options, operationContext); ======= return this.StartCopy(source, Checksum.None, false /* syncCopy */, sourceAcces...
<<<<<<< // Provided as a means of wrapping a WinForms control public static T Create<T>( object o) where T:Control, new() { var r = new T(); r.SetControl(o); return r; } public void SetControl(object c...
<<<<<<< public swf.IWin32Window Win32Window { get { return Control; } } public override object ContainerObject ======= public override swf.Control ContentContainer >>>>>>> public swf.IWin32Window Win32Window { get { return Control; } } public override swf.Control ContentContainer
<<<<<<< ======= public static Padding Convert(SWF.Padding padding) { return new Padding(padding.Left, padding.Top, padding.Right, padding.Bottom); } public static SWF.Padding Convert(Padding padding) { return new SWF.Padding(padding.Left, padding.Top, padding.Right, padding.Bottom); } publ...
<<<<<<< #region IImage Members public int Width { get { return 0;/* TODO */ } } public int Height { get { return 0;/* TODO */ } } #endregion } ======= public override void DrawImage (GraphicsHandler graphics, Rectangle...
<<<<<<< public string Text { get { return editable ? Control.Text : ""; } set { if (editable && value != null) { Control.Text = value; } } } ======= public override Color BackgroundColor { get { var border = Control.FindChild<swc.Border>(); return borde...
<<<<<<< #endregion #region IControl implementation public Eto.Drawing.Point ScreenToWorld (Eto.Drawing.Point p) { throw new NotImplementedException (); } public Eto.Drawing.Point WorldToScreen (Eto.Drawing.Point p) { throw new NotImplementedException (); } public DragDropEffects DoDragDro...
<<<<<<< public static void BlitTexture(CommandBuffer cmd, RTHandleSystem.RTHandle source, RTHandleSystem.RTHandle destination, Vector4 scaleBias, float mipLevel, bool bilinear) ======= public static void BlitQuad(CommandBuffer cmd, Texture source, Vector4 scaleBiasTex, Vector4 scaleBiasRT, int mipLeve...
<<<<<<< g.Add <IButton> (() => new ButtonHandler ()); g.Add <ICheckBox> (() => new CheckBoxHandler ()); g.Add <IComboBox> (() => new ComboBoxHandler ()); g.Add <IDateTimePicker> (() => new DateTimePickerHandler ()); g.Add <IDrawable> (() => new DrawableHandler ()); g.Add <IGridColumn> (() => new GridC...
<<<<<<< using System; using System.IO; using Eto.Drawing; using MonoTouch.UIKit; namespace Eto.Platform.iOS.Drawing { interface IImageHandler { void DrawImage (GraphicsHandler graphics, int x, int y); void DrawImage (GraphicsHandler graphics, int x, int y, int width, int height); void DrawImage (GraphicsHand...
<<<<<<< public static Point GetLocation (NSView view, NSEvent theEvent) { var loc = view.ConvertPointFromView (theEvent.LocationInWindow, null); if (!view.IsFlipped) loc.Y = view.Frame.Height - loc.Y; return Generator.ConvertF (loc); } public override IDisposable ThreadStart () { return ...
<<<<<<< using SD = System.Drawing; ======= using Eto.Platform.Mac.Forms.Controls; using Eto.Platform.Mac.Forms.Printing; using Eto.Platform.Mac.Forms; using Eto.Platform.Mac.Forms.Menu; >>>>>>> using SD = System.Drawing; using Eto.Platform.Mac.Forms.Controls; using Eto.Platform.Mac.Forms.Printing; using Eto.Platform...
<<<<<<< public static Generator Current { get { if (current == null) throw new ApplicationException("Generator has not been initialized"); return current; } } public static void Initialize(string ass...
<<<<<<< public int GetCurrentShadowCount() { return m_ShadowsResult.shadowLights == null ? 0 : m_ShadowsResult.shadowLights.Length; } ShadowRenderPass m_ShadowPass; ======= // TODO: Find a way to automatically create/iterate through deferred material // TODO TO CHECK: SebL I move allo...
<<<<<<< ======= var isMe = PlayerDamageDealt.Source.User.Id.Id == PacketProcessor.Instance.PlayerTracker.Me().User.Id.Id; var meCol100 = BasicTeraData.Instance.WindowData.PlayerColor; var meCol30 = Color.FromArgb((byte) (meCol100.A == 0 ? 0 : 60), meCol10...
<<<<<<< private void ExcelSMADPSChanged(object sender, RoutedPropertyChangedEventArgs<object> e) ======= private void EnableSoundConsoleBeepFallback(object sender, RoutedEventArgs e) { BasicTeraData.Instance.WindowData.SoundConsoleBeepFallback = true; } private voi...
<<<<<<< NoPaste.Status = BasicTeraData.Instance.WindowData.NoPaste; NoAbnormalsInHUD.Status = BasicTeraData.Instance.WindowData.NoAbnormalsInHUD; ======= NoPaste.IsChecked = BasicTeraData.Instance.WindowData.NoPaste; NoAbnormalsInHUD.IsChecked = BasicTeraData.Instance.W...
<<<<<<< DpsWebsiteExport.Status = BasicTeraData.Instance.WindowData.SiteExport; AuthTokenTextbox.Text = BasicTeraData.Instance.WindowData.TeraDpsToken; SetAuthTokenRowVisibility(BasicTeraData.Instance.WindowData.SiteExport); //AuthTokenTextbox.Parent.SetValue(HeightProperty, BasicTer...
<<<<<<< Parse("excel_sma_dps_seconds", "ExcelSMADPSSeconds"); ======= Parse("do_not_warn_on_crystalbind", "DoNotWarnOnCB"); Parse("excel_cma_dps_seconds", "ExcelCMADPSSeconds"); >>>>>>> Parse("excel_cma_dps_seconds", "ExcelCMADPSSeconds");
<<<<<<< var skilldamage = skill.Amount(); skillLog.SkillAverageCrit = Math.Round(skill.AvgCrit()) + ""; skillLog.SkillAverageWhite = Math.Round(skill.AvgWhite()) + ""; skillLog.SkillCritRate = skill.CritRate() + ""; ski...
<<<<<<< public bool Attach = false; public bool MessagesEnabled = false; ======= public IReadOnlyDictionary<string, string> CustomProperties = null; public bool Attach = false; >>>>>>> public bool Attach = false; public bool MessagesEnabled = false; public IReadOnlyDictionar...
<<<<<<< #region License // // Copyright (c) 2007-2009, Sean Chambers <schambers80@gmail.com> // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICEN...
<<<<<<< VersionLoader.UpdateVersionInfo(migrationInfo.Version, migrationInfo.Description); if (useTransaction) Processor.CommitTransaction(); ======= if (migrationInfo.IsAttributed()) VersionLoader.UpdateVersionInfo(migrationInfo.Version); ...
<<<<<<< public void Process(AlterDefaultConstraintExpression expression) { Process(Generator.Generate(expression)); } ======= public abstract void Process(PerformDBOperationExpression expression); >>>>>>> public void Process(AlterDefaultConstraintExpression expression) ...
<<<<<<< expression.ApplyConventions(Conventions); Time(expression.ToString(), () => expression.ExecuteWith(Processor)); ======= expression.ApplyConventions( Conventions ); if (expression is InsertDataExpression) { insertTicks += time(() => expression.ExecuteW...
<<<<<<< public static string ListAvailableProcessorTypes() { IEnumerable<Type> processorTypes = typeof(IMigrationProcessorFactory).Assembly.GetExportedTypes() .Where(t => typeof(IMigrationProcessorFactory).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface); string processorList = string.Empty; fo...
<<<<<<< { return typeof(IMigration).IsAssignableFrom(type) && type.HasAttribute<MigrationAttribute>(); } public static bool TypeIsProfile(Type type) { return typeof(IMigration).IsAssignableFrom(type) && type.HasAttribute<ProfileAttribute>(); } pu...
<<<<<<< #region License // // Copyright (c) 2007-2009, Sean Chambers <schambers80@gmail.com> // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICEN...
<<<<<<< [Test] public void CallingUniqueAddsIndexExpressionToContext() { var collectionMock = new Mock<ICollection<IMigrationExpression>>(); ======= [TestCase(Rule.Cascade), TestCase(Rule.SetDefault), TestCase(Rule.SetNull), TestCase(Rule.None)] public void CallingO...
<<<<<<< [Test] public void CallingFilterExpressingInPostgres() { var additionalFeatures = new Dictionary<string, object>() { [PostgresExtensions.IndexFilter] = "" }; var indexMock = new Mock<IndexDefinition>(); indexMo...
<<<<<<< using FluentMigrator.Runner.Initialization; ======= using FluentMigrator.Infrastructure; >>>>>>> using FluentMigrator.Infrastructure; using FluentMigrator.Runner.Initialization; <<<<<<< public VersionLoader(IMigrationRunner runner, IRunnerContext runnerContext, Assembly assembly, IMigration...
<<<<<<< public string DescriptionColumnName { get { return "Description"; } } ======= public virtual bool OwnsSchema { get { return true; } } >>>>>>> public string DescriptionColumnName { get { return "Descript...
<<<<<<< private void CreateProcessor() { IMigrationProcessorFactory processorFactory = ProcessorFactory.GetFactory(ProcessorType); Processor = processorFactory.Create(Connection); } ======= >>>>>>> <<<<<<< { if (!Path.IsPathRooted(TargetAssembly)) ======= { var r...
<<<<<<< ======= >>>>>>> <<<<<<< } ======= ICreateConstraintOnTableSyntax PrimaryKey(); ICreateConstraintOnTableSyntax PrimaryKey(string primaryKeyName); ICreateConstraintOnTableSyntax UniqueConstraint(); ICreateConstraintOnTableSyntax UniqueConstraint(string constraintName)...
<<<<<<< #region License // // Copyright (c) 2007-2009, Sean Chambers <schambers80@gmail.com> // Copyright (c) 2010, Nathan Brown // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // ...
<<<<<<< ======= using System.Data; using FluentMigrator.Expressions; using FluentMigrator.Runner.Generators; using FluentMigrator.Runner.Generators.Jet; using NUnit.Framework; using NUnit.Should; >>>>>>>
<<<<<<< var runner = new MigrationVersionRunner(conventions, processor, typeof(MigrationVersionRunnerTests)); ======= var connection = new SqlConnection(connectionString); connection.Open(); var processor = new SqlServerProcessor(connection, new SqlServerGe...
<<<<<<< IAssemblyCollection MigrationAssemblies { get; } ======= IMigrationInformationLoader MigrationLoader { get; set; } Assembly MigrationAssembly { get; } >>>>>>> IMigrationInformationLoader MigrationLoader { get; set; } IAssemblyCollection MigrationAssemblies { get; }
<<<<<<< internal OleDbConnection PersistentConnection { get; set; } ======= internal TrimSpacesType TrimSpaces { get; set; } >>>>>>> internal OleDbConnection PersistentConnection { get; set; } internal TrimSpacesType TrimSpaces { get; set; } <<<<<<< PersistentConnection = args.Persisten...
<<<<<<< var companies = (from c in ExcelQueryFactory.Worksheet<Company>(null, "", null, new LogManagerFactory()) select c).Contains(new Company()); ======= Assert.That(() => (from c in ExcelQueryFactory.Worksheet<Company>(null, "", null) ...
<<<<<<< if (columns.Contains(columnName)) { var value = GetColumnValue(data, columnName, prop.Name).Cast(prop.PropertyType); value = TrimStringValue(value); result.SetProperty(prop.Name, v...
<<<<<<< semaphorekey.Acquire(CancellationToken.None); Assert.True(semaphorekey.IsHeld); ======= await semaphorekey.Acquire(CancellationToken.None); >>>>>>> await semaphorekey.Acquire(CancellationToken.None); Assert.True(semaphorekey.IsHeld); <<<<<<< ...
<<<<<<< private System.Windows.Forms.Label label1; private System.Windows.Forms.ToolStripMenuItem debugToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem textEditorToolStripMenuItem; ======= private DigitalRune.Windows.Docking.DockPanel dockPanel; private System....
<<<<<<< this.IsCommand("run-console", "Run in console mode, treating each line of console input as a command."); this.HasOption("strict", "Exit console mode if any command fails.", v => StrictMode = true); ======= this.IsCommand("run-console", "Run lines within a console"); >>>>>>...
<<<<<<< using System; using System.Collections.Generic; using System.Linq; using System.Text; using WCell.Constants.Spells; using WCell.Core.Initialization; using WCell.RealmServer.Misc; using WCell.RealmServer.Spells; using WCell.RealmServer.Spells.Auras; using WCell.RealmServer.Spells.Effects; namespace WCell.Addon...
<<<<<<< internal IMessageHandler MessageHandler { get; } ======= public JsonSerializer JsonSerializer { get; } /// <summary> /// Gets or sets a value indicating whether to cancel all methods dispatched locally /// that accept a <see cref="CancellationToken"/> when the connecti...
<<<<<<< public async Task InvokeWithParameterObjectAsync_AndCancel() { using (var cts = new CancellationTokenSource()) { var invokeTask = this.clientRpc.InvokeWithParameterObjectAsync<string>(nameof(Server.AsyncMethodWithJTokenAndCancellation), new { b = "a" }, cts.Token); ...
<<<<<<< ======= private void OnLoaded(object sender, RoutedEventArgs e) { if (_shadowCanvas != null) { _shadowCanvas.Draw += OnDraw; } } >>>>>>>
<<<<<<< //如果除了作为主包外还被其他包引用那么就不释放 if (!dependenciesBundles.ContainsKey(assetbundlePath)) { //防止assetbundle因为一些意外原因已经被释放了 if (loadAssetBundles[assetbundlePath].Bundle != null) { loadAssetBun...
<<<<<<< typeof(CoreProvider), ======= typeof(TimeQueueProvider), >>>>>>> typeof(CoreProvider), typeof(TimeQueueProvider),
<<<<<<< /// Resolve all references to SecuritySchemes /// </summary> /// <param name="securityRequirement"></param> public override void Visit(OpenApiSecurityRequirement securityRequirement) { foreach (var scheme in securityRequirement.Keys.ToList()) { ...
<<<<<<< context = new ParsingContext { ExtensionParsers = _settings.ExtensionParsers }; return context.Parse(yamlDocument, diagnostic); ======= // Parse the OpenAPI Document context = new ParsingContext(); var document...
<<<<<<< using Microsoft.OpenApi.Any; ======= >>>>>>> using Microsoft.OpenApi.Any; <<<<<<< ======= // To Do compare schema as IOpenApiExtensible >>>>>>>
<<<<<<< using NetBox.IO; using NetBox; ======= using System.Collections.Generic; >>>>>>> using NetBox.IO; using NetBox; using System.Collections.Generic;
<<<<<<< public object[] this[int row] { get { return Columns.Select(column => column.Values[row]).ToArray(); } } ======= /// <summary> /// Used to get the row values /// </summary> /// <param name="row">The index of the row beginning w...
<<<<<<< gitRepository.Expect(x => x.AssertValidBranchName(GIT_BRANCH_TO_INIT)).Return(GIT_BRANCH_TO_INIT).Repeat.Never(); gitRepository.Expect(x => x.CreateTfsRemote(null)).Callback<RemoteInfo>((info) => info.Id == GIT_BRANCH_TO_INIT && info.Url == "http://myTfsServer:8080/tfs" && info.Repositor...
<<<<<<< int FindMergeChangesetParent(string path, long firstChangeset, GitTfsRemote remote); ======= /// <summary> /// Creates and maps a workspace for the given remote with the given local -> server directory mappings, at the given Tfs version, /// and then performs the action. ...
<<<<<<< void CheckinTool(string head, TfsChangesetInfo parentChangeset); ======= long Checkin(string treeish, TfsChangesetInfo parentChangeset); } public static partial class Ext { public static void Fetch(this IGitTfsRemote remote) { remote.Fetch(new Dictionar...
<<<<<<< using System; using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; using Sep.Git.Tfs.Core; ======= using Sep.Git.Tfs.Core; >>>>>>> using System; using System.Linq; using Sep.Git.Tfs.Core; <<<<<<< ======= [Fact] public void GetsPathWithQuotepath() { ...
<<<<<<< [Fact] public void TestEmptyFile() ======= public AuthorsFileUnitTest() { // // TODO: Add constructor logic here // } private TestContext testContextInstance; /// <summary> ///Gets or sets the test context wh...
<<<<<<< public static object GetSolarPanelStatus(Vessel vessel) { bool atLeastOneSolarPanel = false; // No panels at all? Always return false foreach (Part p in vessel.parts) { foreach (ModuleDeployableSolarPanel c in p.FindModulesImplementing<ModuleDeployableSolarPanel>()) {...
<<<<<<< FileData data = Util.GetFileData(titleID, "", SceneReleasesList); SceneReleasesSelectedItems.Add(new Tuple<string, string>(titleID, ""), data); ======= FileData data = Util.GetFileData(titleID, SceneReleasesList); ...
<<<<<<< string version = Convert.ToString(((FileData)((OLVListItem)item).RowObject).Version); FileData data = Util.GetFileData(titleID, version, LocalFilesList); LocalFilesListSelectedItems.Add(new Tuple<string, string>(titleID, version), data); =...
<<<<<<< /* var watch = new FileSystemWatcher(); watch.Path = AppDomain.CurrentDomain.BaseDirectory; watch.Filter = Util.LOG_FILE; watch.NotifyFilter = NotifyFilters.LastWrite; //more options watch.Changed += new FileSystemEventHandler(O...
<<<<<<< // Consider removing the ambient lifetime concept. I thin the convenience might not outweight the potential confusion. // Samples for different data sources (e.g. An azure table, a file system) // Lots of testing ======= // Samples for different data sources (e.g. An azure table, a file sys...
<<<<<<< RegisterDisplaySerializer(new PlainTextResultEncoder()); RegisterDisplaySerializer(new ListResultEncoder()); RegisterDisplaySerializer(new TableDisplaySerializer()); ======= RegisterDisplayEncoder(new PlainTextResultEncoder()); RegisterDisplayEncoder...
<<<<<<< using System; using System.Collections.Generic; namespace BepInEx.Logging { /// <summary> /// A static <see cref="BaseLogger"/> instance. /// </summary> public static class Logger { public static ICollection<ILogListener> Listeners { get; } = new List<ILogListener>(); public static ICollection<ILogS...
<<<<<<< toolStripButton_DrawMode.Image = Resources.pencil; toolStripButton_DrawMode.DisplayStyle = ToolStripItemDisplayStyle.Image; toolStripButton_SelectionMode.Image = Resources.cursor_arrow; toolStripButton_SelectionMode.DisplayStyle = ToolStripItemDisplayStyle.Image; ======= toolStripButton_DragBox...