conflict_resolution
stringlengths
27
16k
<<<<<<< Logger.LogError(e, "Error while handling minority fork situation."); MessageHub.Instance.Publish(StateEvent.RollbackFinished); ======= _logger?.Error(e, "Error while handling minority fork situation."); >>>>>>> Logger.LogError(e, "Error while ha...
<<<<<<< var boundBlockInfo = await crossChainInfo.GetBoundParentChainBlockInfoAsync(parentChainBlockRootInfo.Height); Assert.Equal(parentChainBlockData, boundBlockInfo); ======= var boundBlockInfo = await crossChainInfo.GetBoundParentChainBlockInfoAsync(chainId, parentChainBlockRoo...
<<<<<<< object remoteValue = DoRemote(ownerID); if (remoteValue != null || m_doRemoteOnly) return (List<Classified>)remoteValue; Dictionary<string, object> where = new Dictionary<string, object>(1); where["OwnerUUID"] = ownerID; ======= Query...
<<<<<<< Logger.LogTrace($"Timeout to get cached data from chain {_targetChainId}"); ======= _logger?.Trace($"Timeout to get cached data from chain {_targetChainId.DumpBase58()}"); >>>>>>> Logger.LogTrace($"Timeout to get cached data from chain {_targetChain...
<<<<<<< Dictionary<DataPath, StateCache> changedDict = new Dictionary<DataPath, StateCache>(); if (!IsSuccessful()) ======= Dictionary<Hash, StateCache> changedDict = new Dictionary<Hash, StateCache>(); if (ExecutionStatus != ExecutionStatus.ExecutedButNotCommitted) >>...
<<<<<<< services.AddSingleton<IBlockAcceptedLogEventProcessor, TransactionFeeCalculatorCoefficientUpdatedLogEventProcessor>(); services.AddSingleton<ITransactionFeeExemptionService, TransactionFeeExemptionService>(); ======= services .AddSingleton<IB...
<<<<<<< using Acs0; using Acs4; using AElf.Contracts.Consensus.DPoS.SideChain; ======= using AElf.Contracts.Consensus.AEDPoS; using AElf.Contracts.Genesis; >>>>>>> using Acs0; using AElf.Contracts.Consensus.AEDPoS; <<<<<<< internal ConsensusContractContainer.ConsensusContractReferenceState ConsensusContract...
<<<<<<< ======= private const int MaxLenght = 200; public int InvalidBlockCount { get { int count; _rwLock.AcquireReaderLock(Timeout); try { count = _blockCache.Count; ...
<<<<<<< // At this point the current sync source either doesn't have the next announcement // or has none at all. ======= >>>>>>> <<<<<<< Logger.LogDebug($"Peer {peer.Peer} has been removed, trying to find another peer to sync."); Syn...
<<<<<<< ConfigurationSmartContractAddressNameProvider.Name); list.AddGenesisSmartContract(AssociationContractCode, AssociationSmartContractAddressNameProvider.Name); ======= ConfigurationSmartContractAddressNameProvider.Name, new SystemContractDeploymentInput.Ty...
<<<<<<< var targetCandidate = State.CandidateInformationMap[input.CandidatePubkey]; Assert(targetCandidate != null && targetCandidate.IsCurrentCandidate, $"Candidate: {input.CandidatePubkey} dose not exist"); ======= var targetInformation = State.CandidateInformatio...
<<<<<<< public SingletonState<AuthorityStuff> MethodFeeController { get; set; } ======= public SingletonState<RequiredAcsInContracts> RequiredAcsInContracts { get; set; } >>>>>>> public SingletonState<RequiredAcsInContracts> RequiredAcsInContracts { get; set; } public SingletonState...
<<<<<<< ======= using AElf.ChainController.EventMessages; using AElf.Common.Attributes; >>>>>>> using AElf.ChainController.EventMessages; <<<<<<< using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; ======= using Easy.MessageHub; >>>>>>> using Easy.MessageHub; using Microsoft.Ext...
<<<<<<< .Type(typeof(decimal).Name, Permission.Allowed) .Type(typeof(string).Name, Permission.Allowed) ======= .Type(typeof(string).Name, Permission.Allowed, member => member .Constructor(Permission.Denied)) >>>>>>> ...
<<<<<<< public ILogger<ConsensusBlockValidationFilter> Logger {get;set;} private readonly Address _nodeAddress; private readonly ECKeyPair _nodeKeyPair; ======= private readonly ILogger _logger; private Address ConsensusContractAddress => ContractHelpers.G...
<<<<<<< ======= /* >>>>>>>
<<<<<<< while (Query(new byte[] { IscCodes.isc_info_svc_line }).Count != 0) { } } bool ProcessMessages(ArrayList items) { var message = GetMessage(items); if (message == null) return false; OnServiceOutput(message); return true; ======= >>>>>>>
<<<<<<< ======= _compression = compression; _srpClient = new SrpClient(); >>>>>>> _compression = compression; <<<<<<< if (operation == IscCodes.op_cond_accept || operation == IscCodes.op_accept_data) { var data = xdrStream.ReadBuffer(); var acceptPluginName = xdrStream.ReadString...
<<<<<<< this.hubScopeRefreshTokenTimer = new IOThreadTimer(s => ((IotHubConnection)s).OnRefreshTokenAsync(), this, false); this.iotHubLinkRefreshTokenTimers = new ConcurrentDictionary<string, IotHubLinkRefreshTokenTimer>(); this.useWebSocketOnly = useWebSocketOnly; ======= ...
<<<<<<< volatile bool closeCalled; #if !WINDOWS_UWP ======= #if !PCL >>>>>>> volatile bool closeCalled; #if !PCL <<<<<<< #if WINDOWS_UWP return Create(hostname, authenticationMethod, TransportType.Http1); #else ======= #if WINDOWS_UWP || PCL return Create(hostname, authenti...
<<<<<<< #endif ======= using Microsoft.Azure.Devices.Client.Exceptions; using Microsoft.Azure.Devices.Client.Extensions; >>>>>>> using Microsoft.Azure.Devices.Client.Exceptions; using Microsoft.Azure.Devices.Client.Extensions; <<<<<<< #if !WINDOWS_UWP readonly string hostName; readon...
<<<<<<< ======= OptionXY weight, CapOptions cap, OffsetOptions offset, Option acceleration, Option limtOrExp, Option midpoint, >>>>>>> <<<<<<< ======= public OptionXY Weight { get; } public CapOptions Cap { get; } pu...
<<<<<<< directionalMultipliers = driverSettings.directionalMultipliers, domainArgs = ApplyOptions.Directionality.GetDomainArgs(), rangeXY = ApplyOptions.Directionality.GetRangeXY(), ======= directionalMultipliers = driverSettings.directionalMultipliers, ...
<<<<<<< public PixelData GetPixelData() { return new PixelData(GetPixels32(), Width(), Height()); } ======= public void InitScreen() { Renderer renderer = GetComponent<Renderer>(); outputTexture = new Texture2D(webCamTexture.width, webCamTexture.height); renderer.material.mainTexture = outputTe...
<<<<<<< public RyuJitNodeFactory(CompilerTypeSystemContext context, CompilationModuleGroup compilationModuleGroup) : base(context, compilationModuleGroup, new CompilerGeneratedMetadataManager(compilationModuleGroup, context), new CoreRTNameMangler(context.Target.IsWindows ? (Node...
<<<<<<< #region IsMissing and IsNotMissing /// <summary> /// Returns true if the selected property is missing from the document /// </summary> /// <typeparam name="T">Type of the property being selected</typeparam> /// <param name="property">Property to test</param> ...
<<<<<<< return EntityFilterManager.ApplyFilters(new BucketQueryable<T>(_bucket, Configuration)); ======= return DocumentFilterManager.ApplyFilters(new BucketQueryable<T>(_bucket)); >>>>>>> return DocumentFilterManager.ApplyFilters(new BucketQueryable<T>(_bucket, Configuration));
<<<<<<< SetKeywords(builtinParams, m_ProceduralSkyParameters); ======= SetKeywords(builtinParams, proceduralSkyParams, renderForCubemap); >>>>>>> SetKeywords(builtinParams, m_ProceduralSkyParameters, renderForCubemap); <<<<<<< SetUniforms(builtinParams, m_ProceduralSk...
<<<<<<< if (testFileContext.TestContext.TestFileSettings.CreateFailedTestForFileError.GetValueOrDefault()) { var fileErrorTest = new TestCase(); fileErrorTest.InputTestFile = testFileContext.ReferencedFile.Path; fileErrorTest.TestName = string.Form...
<<<<<<< public bool Coverage { get; protected set; } ======= public TestingMode TestMode { get { return testMode; } protected set { testMode = value; } } >>>>>>> public bool Coverage { get; protected set; } public TestingMode TestMode {...
<<<<<<< private readonly ICoverageEngine mainCoverageEngine; ======= private readonly IJsonSerializer serializer; >>>>>>> private readonly ICoverageEngine mainCoverageEngine; private readonly IJsonSerializer serializer; <<<<<<< ICoverageEngine covera...
<<<<<<< ======= SetGlobalOptions(commandLine); >>>>>>> SetGlobalOptions(commandLine); <<<<<<< Console.WriteLine(" /vsoutput : Print output in a format that the VS error list recognizes"); Console.WriteLine(" /coverage : Enable coverage colle...
<<<<<<< ======= using System.Collections.Generic; using System.Diagnostics; using System.DirectoryServices.ActiveDirectory; using System.Linq; using System.Net; using System.Runtime.InteropServices; >>>>>>> <<<<<<< if (!response.IsFieldValid("#ADDom") || !response.IsFieldValid("#ADUser") || ...
<<<<<<< using System.Web.Mvc; ======= using System.ServiceModel; >>>>>>> using System.ServiceModel; using System.Web.Mvc;
<<<<<<< public Import(Quoted path, Value features, bool isOnce) : this((Node)path, features, isOnce) ======= public Import(Quoted path, IImporter importer, Value features, ImportOptions option) : this(path.Value, importer, features, option) >>>>>>> public Import(Quoted...
<<<<<<< namespace dotless.Core.Parser.Tree { using System; using System.Collections.Generic; using System.Linq; using Exceptions; using Infrastructure; using Infrastructure.Nodes; using Utils; using Plugins; public class MixinCall : Node { public List<NamedArgument> Argu...
<<<<<<< entityProcessors = new EntityProcessorList(); ======= // setup our resolution policy. we'll commit it in begin _resolutionPolicy = defaultSceneResolutionPolicy; _designResolutionSize = defaultDesignResolutionSize; >>>>>>> entityProcessors = new EntityProcessorList(); // setup our resoluti...
<<<<<<< DirLandReplyData[] FindLandForSale(string searchType, uint price, uint area, int StartQuery, uint Flags); #endregion #region Classifieds /// <summary> /// Searches for classifieds /// </summary> /// <param name = "queryText"></param> /// <para...
<<<<<<< await _edgeHubClient.SetMethodHandlerAsync("GetDiagnosticInfo", HandleGetDiagnosticInfoMethodAsync, _edgeHubClient); await _edgeHubClient.SetMethodHandlerAsync("GetDiagnosticLog", HandleGetDiagnosticLogMethodAsync, _edgeHubClient); await _edgeHubClient...
<<<<<<< ClientItemGenericUnlock = 0x0400, ======= ServerRealmBroadcast = 0x03E1, >>>>>>> ServerRealmBroadcast = 0x03E1, ClientItemGenericUnlock = 0x0400,
<<<<<<< private LogoutManager logoutManager; private PendingFarTeleport pendingFarTeleport; ======= private PendingTeleport pendingTeleport; >>>>>>> private LogoutManager logoutManager; private PendingTeleport pendingTeleport; <<<<<<< RealmId = 358, ======= ...
<<<<<<< ClientLogout = 0x00C0, ======= ClientHousingResidencePrivacyLevel = 0x00C9, >>>>>>> ClientLogout = 0x00C0, ClientHousingResidencePrivacyLevel = 0x00C9, <<<<<<< ClientSellItemToVendor = 0x0166, ServerAbilityPoints ...
<<<<<<< GeoCoordinate point1 = new GeoCoordinate(51.158075, 2.961545); GeoCoordinate point2 = new GeoCoordinate(51.190503, 3.004793); RouterPoint routerPoint1 = _router.Resolve(Vehicle.Car, point1); RouterPoint routerPoint2 = _router.Resolve(Vehicle.Car, point2); ...
<<<<<<< string cloneFolder, ScriptBlock installScript, AssemblyInfo assemblyInfo, ======= ExpandableString cloneFolder, ScriptBlock installScript, >>>>>>> ExpandableString cloneFolder, ScriptBlock installScript, Assem...
<<<<<<< Task InvalidateCacheAsync(IEnumerable<T> documents, ICommandOptions options = null); Task<long> CountAsync(ICommandOptions options = null); Task<T> GetByIdAsync(string id, ICommandOptions options = null); Task<IReadOnlyCollection<T>> GetByIdsAsync(IEnumerable<string> ids, IComman...
<<<<<<< ISearchResponse<TResult> response; if (useSnapshotPaging == false || String.IsNullOrEmpty(elasticPagingOptions.ScrollId)) { SearchDescriptor<T> searchDescriptor = CreateSearchDescriptor(query); ======= ISearchResponse<TResult> response = null; i...
<<<<<<< public Task<FindResults<Employee>> GetAllByCompanyAsync(string company, PagingOptions paging = null) { return FindAsync(new MyAppQuery().WithCompany(company).WithPaging(paging)); ======= public Task<IFindResults<Employee>> GetAllByCompanyAsync(string company, PagingOptions paging =...
<<<<<<< public async Task<T> GetByIdAsync(string id, ICommandOptions options = null) { if (String.IsNullOrEmpty(id)) ======= public async Task<T> GetByIdAsync(Id id, bool useCache = false, TimeSpan? expiresIn = null) { if (String.IsNullOrEmpty(id.Value)) >>>>>>> public...
<<<<<<< public async Task PatchAsync(string id, object update, ICommandOptions options = null) { if (String.IsNullOrEmpty(id)) ======= public async Task PatchAsync(Id id, object update, bool sendNotification = true) { if (String.IsNullOrEmpty(id.Value)) >>>>>>> public ...
<<<<<<< //if (progressCallbackAsync == null) { // progressCallbackAsync = (progress, message) => { // _logger.Info("Reindex Progress {0}%: {1}", progress, message); // return Task.CompletedTask; // }; //} ...
<<<<<<< internal static ResponseCacheContext CreateTestContext(ITestSink testSink) ======= internal static ResponseCachingContext CreateTestContext(TestSink testSink) >>>>>>> internal static ResponseCachingContext CreateTestContext(ITestSink testSink)
<<<<<<< /// <summary> /// Options for persisted grants. /// </summary> public PersistentGrantOptions PersistentGrants { get; set; } = new PersistentGrantOptions(); ======= /// <summary> /// Gets or sets the license key. /// </summary> public string Lic...
<<<<<<< context.AddRequestedClaims(user.Claims); ======= if (user != null) { context.AddFilteredClaims(user.Claims); } >>>>>>> if (user != null) { context.AddRequestedClaims(user.Cl...
<<<<<<< /// <summary> /// Linear interpolates B<->C using percent A /// </summary> /// <param name="a"></param> /// <param name="b"></param> /// <param name="c"></param> /// <returns></returns> public static double lerp(double a, double b, double ...
<<<<<<< ======= using System.IO; using System.Linq; using System.Text; >>>>>>> using System.IO;
<<<<<<< if (options.IsMultiInstanceTask) { unboundTask.MultiInstanceSettings = new MultiInstanceSettings(options.InstanceNumber); unboundTask.MultiInstanceSettings.CoordinationCommandLine = options.BackgroundCommand; unboundTask.MultiInstanceSettin...
<<<<<<< using System.Collections.Generic; ======= using System.Collections.Generic; >>>>>>> using System.Collections.Generic; <<<<<<< public string BackgroundCommand { get; set; } public List<ResourceFileInfo> CommonResourceFiles { get; set; } public int InstanceNumber { get; set; } ...
<<<<<<< public void ValueOrDefaultFactory() => Value .ValueOrDefault(() => 5) .Should() .Be(10); [Fact] public void ValueOrNull() => Value .ValueOrNull() .Should() .Be(IntValue); [Fact] ======= >>>>>>> public void ValueOrDefaultFactory() => Value .Value...
<<<<<<< IronRuby.Builtins.RubyModule def19 = DefineModule("IronRuby::Clr::FlagEnumeration", typeof(IronRuby.Builtins.FlagEnumeration), false, LoadIronRuby__Clr__FlagEnumeration_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray); ======= IronRuby.Builtins.RubyModule def21 = DefineMo...
<<<<<<< protected override void UnhandledException(Exception e) { // Kernel#at_exit can access $!. So we need to publish the uncaught exception RubyOps.SetCurrentExceptionAndStackTrace(Ruby.GetExecutionContext(Engine), e); base.UnhandledException(e); } prot...
<<<<<<< Python = new LangSetup( new[] { "IronPython","Python","py" },new[] { ".py" }, "IronPython 2.7", "IronPython.Runtime.PythonContext", "IronPython, Version=2.7.0.10, Culture=neutral" ======= Python = new LangSetup( new[] { "IronPython","Python","py" },new[] { ".py" }, "Iro...
<<<<<<< // Real exception begin propagated by the CLR. Needed for lazy initialization of message, backtrace ======= // An exception class can implement singleton method "new" that returns an arbitrary instance of an exception. // This mapping needs to be applied on exceptions created in librar...
<<<<<<< if (declaringDef.Compatibility != RubyCompatibility.Default) { def.Compatibility = (RubyCompatibility)Math.Max((int)declaringDef.Compatibility, (int)def.Compatibility); } // we will need a reference for setting ...
<<<<<<< [RubyMethod("to_ary")] public static RubyArray/*!*/ ToExplicitArray(RubyArray/*!*/ self) { return self; } ======= [RubyMethod("to_ary")] public static RubyArray/*!*/ ToAry(RubyArray/*!*/ self) { return self; } >>>>>>> public st...
<<<<<<< using CommonServiceLocator; ======= using Microsoft.Practices.ServiceLocation; >>>>>>> using Microsoft.Practices.ServiceLocation;
<<<<<<< IReadOnlyCollection<Type> Sagas { get; } ======= IReadOnlyCollection<Type> SnapshotTypes { get; } >>>>>>> IReadOnlyCollection<Type> Sagas { get; } IReadOnlyCollection<Type> SnapshotTypes { get; }
<<<<<<< using EventFlow.Sagas; ======= using EventFlow.Snapshots; >>>>>>> using EventFlow.Sagas; using EventFlow.Snapshots; <<<<<<< private readonly ISagaDefinitionService _sagaDefinitionService; ======= private readonly ISnapshotDefinitionService _snapshotDefinitionService; >>>>>>> priva...
<<<<<<< It.IsAny<Func<IReadModelContext>>(), It.IsAny<Func<IReadModelContext, IReadOnlyCollection<IDomainEvent>, ReadModelEnvelope<TReadModel>, CancellationToken, Task<ReadModelUpdateResult<TReadModel>>>>(), ======= It.IsAny<IReadModelContextFactory>(), ...
<<<<<<< BatchId = batchId, Data = e.SerializedData, Metadata = e.SerializedMetadata, ======= Data = e.Data, Metadata = e.Meta, >>>>>>> ...
<<<<<<< .Setup(s => s.LoadAggregateAsync<TestAggregate>(It.IsAny<TestId>(), It.IsAny<CancellationToken>())) .Returns(() => Task.FromResult(new TestAggregate(TestId.New))); ======= .Setup(s => s.LoadAggregateAsync<TestAggregate>(It.IsAny<string>(), It.IsAny<CancellationT...
<<<<<<< using EventFlow.Sagas; ======= using EventFlow.Snapshots; using EventFlow.Snapshots.Stores; using EventFlow.Snapshots.Stores.InMemory; using EventFlow.Snapshots.Stores.Null; using EventFlow.Snapshots.Strategies; >>>>>>> using EventFlow.Sagas; using EventFlow.Snapshots; using EventFlow.Snapshots.Stores; using...
<<<<<<< public EventFlowOptions UseFilesEventStore(IFilesEventStoreConfiguration filesEventStoreConfiguration) { AddRegistration(new Registration<IFilesEventStoreConfiguration>(c => filesEventStoreConfiguration, Lifetime.Singleton)); AddRegistration(new Registration<IEventStore, ...
<<<<<<< var testAggregate = EventStore.LoadAggregate<TestAggregate, TestId>(id, CancellationToken.None); testAggregate.Ping(); ======= var testAggregate = await EventStore.LoadAggregateAsync<TestAggregate>(id, CancellationToken.None).ConfigureAwait(false); testAggregate...
<<<<<<< public interface IMongoDbReadModelStore<TReadModel> : IReadModelStore<TReadModel> where TReadModel : class, IReadModel { Task<IAsyncCursor<TReadModel>> FindAsync( Expression<Func<TReadModel, bool>> filter, FindOptions<TReadModel, TReadModel> options = null, CancellationToken cancellationToken = d...
<<<<<<< private readonly ConcurrentBag<Type> _sagaTypes = new ConcurrentBag<Type>(); ======= private readonly ConcurrentBag<Type> _commandTypes = new ConcurrentBag<Type>(); >>>>>>> private readonly ConcurrentBag<Type> _sagaTypes = new ConcurrentBag<Type>(); private readonly Concurr...
<<<<<<< IEnumerable<Type> eventTypes, IEnumerable<Type> sagaTypes) ======= IEnumerable<Type> eventTypes, IEnumerable<Type> snapshotTypes) >>>>>>> IEnumerable<Type> eventTypes, IEnumerable<Type> sagaTypes, IEnumerable<Type> snapshotTy...
<<<<<<< eventFlowOptions.RegisterServices(f => f.Register<IReadModelStore<TAggregate>>(r => r.Resolve<TReadModelStore>(), lifetime)); ======= eventFlowOptions.AddRegistration(new Registration<IReadModelStore<TAggregate>>(r => r.Resolver.Resolve<TReadModelStore>(), lifetime)); >>>>>>> ...
<<<<<<< { AggregateId = id.Value, AggregateSequenceNumber = serializedEvent.AggregateSequenceNumber, Data = serializedEvent.SerializedData, Metadata = serializedEvent.SerializedMetadat...
<<<<<<< using EventFlow.Queries; ======= using EventFlow.ReadStores; >>>>>>> using EventFlow.Queries; using EventFlow.ReadStores; <<<<<<< var queryProcessor = resolver.Resolve<IQueryProcessor>(); var readModelStore = resolver.Resolve<IInMemoryReadModelStore<TestAggregate, TestAggrega...
<<<<<<< // Update sagas await _sagaManager.ProcessAsync(domainEvents, cancellationToken).ConfigureAwait(false); ======= // Update subscriptions AFTER read stores have been updated await _dispatchToEventSubscribers.DispatchAsync(domainEvents, cancellationToken).Configu...
<<<<<<< using Microsoft.AspNetCore.Razor.Language.Legacy; using System.Threading.Tasks; ======= >>>>>>> using System.Threading.Tasks;
<<<<<<< DirLandReplyData[] Landdata = directoryService.FindLandForSale("0", uint.MaxValue, 0, 0, 0); ======= List<DirLandReplyData> Landdata = directoryService.FindLandForSale("0", int.MaxValue.ToString(), "0", 0, 0); >>>>>>> List<DirLandReplyData> Landdata = directory...
<<<<<<< Factory.MetaCode("section").Accepts(AcceptedCharactersInternal.None), Factory.Span(SpanKindInternal.Code, " ", CSharpSymbolType.WhiteSpace).Accepts(AcceptedCharactersInternal.WhiteSpace), Factory.Span(SpanKindInternal.Code, "Header", CSharpSymbolType.I...
<<<<<<< [Parameter(Mandatory = false, HelpMessage = "If true, Initialize Variable actions will be included in the ARM template")] public SwitchParameter IncludeInitializeVariable; ======= [Parameter(Mandatory = false, HelpMessage = "If true, the functionApp gets a static name")] publ...
<<<<<<< #endregion ======= public FlowDocument FlowDoc { get; set; } >>>>>>> #endregion public FlowDocument FlowDoc { get; set; }
<<<<<<< var response = new RestMessage<bool>(false); try { value["_id"] = id; service.Update(collection, value); response.Data = true; return response; } catch (ValidationException err) ...
<<<<<<< DataContext = this; Resources["SelectedLinkProperties"] = SelectedLinkProperties; Dispatcher.UnhandledException += App_DispatcherUnhandledException; ======= Dispatcher.UnhandledException += AppDispatcherUnhandledException; >>>>>>> DataContext = this...
<<<<<<< ======= using System.Runtime.InteropServices; using System.Windows.Forms; >>>>>>> <<<<<<< Link.Inertial.Inertia.SetMomentMatrix(moment); Link.Collision.Origin.SetXYZ(MathOps.GetXYZ(localCollisionTransform)); Link.Collision.Origin.SetRPY(MathOps.GetRPY(localCollisionTran...
<<<<<<< ======= using System.Windows; >>>>>>>
<<<<<<< public SerializedProperty supportAsyncCompute; public SerializedProperty supportsForwardOnly; public SerializedProperty supportsMotionVectors; public SerializedProperty supportsStereo; ======= >>>>>>> public SerializedProperty supportsForwardOnly; public Serial...
<<<<<<< string filename = exportFiles(mRobot.BaseLink, package, 0, exportSTL); ======= logger.Info("Beginning individual files export"); string filename = exportFiles(mRobot.BaseLink, package, 0); >>>>>>> string filename = exportFiles(mRobot.BaseLink, package, 0, exp...
<<<<<<< using FoundationDB.Client.Utils; using JetBrains.Annotations; ======= >>>>>>> using JetBrains.Annotations;
<<<<<<< Log($"Creating '{pathFoo}' ..."); var foo = await logged.ReadWriteAsync(tr => dl.CreateAsync(tr, pathFoo), this.Cancellation); ======= Log("Creating 'Foo' ..."); var foo = await db.ReadWriteAsync(tr => dl.CreateAsync(tr, pathFoo), this.Cancellation); >>>>>>> Log($"Creating '{pathFoo}' ......
<<<<<<< /// <summary>Wrap an existing transaction and log all operations performed</summary> public FdbLoggedTransaction(IFdbTransaction trans, bool ownsTransaction, Action<FdbLoggedTransaction> onCommitted) ======= public FdbLoggedTransaction(IFdbTransaction trans, bool ownsTransaction, Action<FdbLoggedTransac...
<<<<<<< /// <summary>Create an empty log for a newly created transaction</summary> /// <param name="trans"></param> public FdbTransactionLog(IFdbTransaction trans) ======= /// <summary>Create an empty log for a newly created transaction</summary> public FdbTransactionLog(FdbLoggingOptions options) >>>>>>> ...
<<<<<<< public void SetOption(FdbTransactionOption option, ReadOnlySpan<byte> data) ======= /// <inheritdoc /> public void SetOption(FdbTransactionOption option, Slice data) >>>>>>> /// <inheritdoc /> public void SetOption(FdbTransactionOption option, ReadOnlySpan<byte> data) <<<<<<< public void Set(Rea...
<<<<<<< /// <summary> /// Removes empty sections and columns to optimize screen real estate /// </summary> public bool RemoveEmptySectionsAndColumns { get; set; } ======= /// <summary> /// Includes referenced assets in the web part /// </summary> publi...
<<<<<<< termCache.TryAdd(termSetTerm.Key, termSetTerm.Value); ======= var term = termSetTerm.Value; term.IsSourceTerm = isSourceTerm; termCache.TryAdd(termSetTerm.Key, term); Store.Set<ConcurrentDictionary<Guid, TermDa...
<<<<<<< var runtime = RuntimeContext.MakeRuntimeContext("settingsPath", settings, context, logger, (c) => alternateRepository, scriptLibraryBuilder); ======= var runtime = RuntimeContext.MakeRuntimeContext(@"C:\Should_aggregate_a_numeric_field", settings, context, logger, (c, i, l) => alternat...
<<<<<<< using System.Collections; using SadConsole.StringParser; using System.Linq; ======= >>>>>>> using System.Collections; using SadConsole.StringParser; using System.Linq;