conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
using System.Linq;
=======
using Microsoft.Extensions.Hosting;
>>>>>>>
using System.Linq;
using Microsoft.Extensions.Hosting;
<<<<<<<
// If cultures are specified in the configuration, use them (making sure they are among the available cultures),
// otherwise use all the avai... |
<<<<<<<
public static readonly string TestAuthorizationHeader = "FakeAuthorization";
=======
public const string TestUserPrefixHeader = "TestUser";
public const string TestUserId = "UserId";
public const string TestUserName = "UserName";
public const string TestUserRoles = "Us... |
<<<<<<<
_textView.Closed += TextView_Closed;
_isRepl = _textView.Properties.ContainsProperty(BufferProperties.FromRepl);
=======
>>>>>>>
_textView.Closed += TextView_Closed; |
<<<<<<<
/// Looks up a localized string similar to This value is not one of the allowed values for parameter '{0}'..
/// </summary>
public static string Error_DisallowedValue_1arg {
get {
return ResourceManager.GetString("Error_DisallowedValue_1arg", resou... |
<<<<<<<
using System.Runtime.InteropServices;
=======
using System.ComponentModel.Composition;
using System.Runtime.InteropServices;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.ComponentModelHost;
>>>>>>>
using System.ComponentModel.Composition;
using System.Runtime.InteropServices;
using Microsoft.... |
<<<<<<<
using System.IO;
using PowerShellTools.Common.ServiceManagement.DebuggingContract;
=======
>>>>>>>
using System.IO;
using PowerShellTools.Common.ServiceManagement.DebuggingContract;
<<<<<<<
=======
EstablishServiceConnection();
>>>>>>>
<<<<<<<
var conne... |
<<<<<<<
=======
using Microsoft.VisualStudio.Shell.Interop;
using Microsoft.VisualStudio.Shell;
using Microsoft.Win32;
>>>>>>>
<<<<<<<
using System.IO;
using PowerShellTools.Common.ServiceManagement.DebuggingContract;
=======
using MessageBox = System.Windows.MessageBox;
using MessageBoxOptions = System.Windows.M... |
<<<<<<<
private readonly Runspace _runspace = PowershellDebuggingService.Runspace;
private long _requestTrigger;
private string _script = string.Empty;
private int _caretPosition;
private IIntelliSenseServiceCallback _callback;
/// <summary>
/// Request trigger p... |
<<<<<<<
IFactory<Category> factory) : base(jsonFieldsSerializer, aclService, customerService, storeMappingService, storeService, discountService, customerActivityService, localizationService,pictureService)
=======
IFactory<Category> factory,
IDTOHelper dtoHelper) : base(jsonFields... |
<<<<<<<
private readonly IProductAttributeService _productAttributeService;
=======
private readonly IDTOHelper _dtoHelper;
>>>>>>>
private readonly IProductAttributeService _productAttributeService;
private readonly IDTOHelper _dtoHelper;
<<<<<<<
IP... |
<<<<<<<
=======
private void RegisterControllers(ContainerBuilder builder)
{
builder.RegisterType<CustomersController>().InstancePerLifetimeScope();
builder.RegisterType<CategoriesController>().InstancePerLifetimeScope();
builder.RegisterType<ProductsController>().I... |
<<<<<<<
using fNbt;
using Maploader.Core;
using Maploader.Extensions;
=======
>>>>>>>
using fNbt;
using Maploader.Core;
using Maploader.Extensions;
<<<<<<<
if (args.Length == 0 || !(new string[]{"map", "test","find"}.Contains(args[0])))
=======
if (args.Length == 0 || !(new string[] { "map... |
<<<<<<<
=======
//added by rubsy92
if (isoLocation[2] < 0 || isoLocation[2] > 1.0)
{
throw new Exception("z must be between 0 and 1. 0 is the centre of the plate and 1 is on the plate surface. Use the section points to get the top/bottom.") { };
}
>>>>>... |
<<<<<<<
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
=======
using Microsoft.Extensions.DependencyInjection;
>>>>>>>
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
<<<<<<<
=======
u... |
<<<<<<<
GUILayout.BeginHorizontal ();
if (GUILayout.Button ("Toggle stock ocean"))
{
stockOcean=!stockOcean;
}
=======
GUILayout.BeginHorizontal ();
// if (GUILayout.Button ("Toggle depth buffer")) {
// if (!depthbufferEnabled) {
//// cams[2].gameObject.AddCom... |
<<<<<<<
}
return (File.ReadAllText(importPath), importPath);
});
=======
}
return File.ReadAllText(importPath);
});
this.AddText(File.ReadAllText(filePath), filePath, importResolver);
>>... |
<<<<<<<
readonly EventStoreConnection _connection;
readonly SnapshotReaderConfiguration _configuration;
=======
readonly IEventStoreConnection _connection;
readonly SnapshotStoreReadConfiguration _configuration;
>>>>>>>
readonly IEventStoreConnection _connection;
readonly SnapshotReaderConfig... |
<<<<<<<
readonly EventStoreConnection _connection;
readonly SnapshotReaderConfiguration _configuration;
=======
readonly IEventStoreConnection _connection;
readonly SnapshotStoreReadConfiguration _configuration;
>>>>>>>
readonly IEventStoreConnection _connection;
readonly SnapshotReaderConfig... |
<<<<<<<
$@"select InvocationData, StateName, Arguments, CreatedAt from [{_storage.SchemaName}].Job where Id = @id";
=======
string.Format(@"select InvocationData, StateName, Arguments, CreatedAt from [{0}].Job with (readcommittedlock) where Id = @id", _storage.GetSchemaName());
>>>>>>>
$@"select Invo... |
<<<<<<<
#if NETFULL
using System.Transactions;
#else
using System.Data;
#endif
=======
>>>>>>>
<<<<<<<
$@"select * from [{_storage.SchemaName}].Server",
transaction: transaction)
=======
string.Format(@"select * from [{0}].Server with (nolock)", _storage... |
<<<<<<<
DisplayStorageConnectionString = true;
=======
JobNameProvider = null;
>>>>>>>
DisplayStorageConnectionString = true;
JobNameProvider = null;
<<<<<<<
public bool DisplayStorageConnectionString { get; set; }
=======
/// <summary>
///... |
<<<<<<<
var backgroundJob = _factory.Create(new CreateContext(storage, connection, job, state));
var jobId = backgroundJob?.Id;
=======
var context = new CreateContext(storage, connection, job, state);
context.Parameters["RecurringJobId"]... |
<<<<<<<
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string steamRememberLogin {
get {
return ((string)(t... |
<<<<<<<
break;
default:
break;
}
_defaultStack.MeshModifiers.AddRange(defaultMeshModifierStack);
_defaultStack.GoModifiers.AddRange(defaultGOModifierStack);
//Add any additional modifiers that were added.
_defaultStack.MeshModifiers.AddRange(_layerProperties.MeshModifiers);
_defaultSt... |
<<<<<<<
private string objectId = "";
bool showTexturing
{
get
{
return EditorPrefs.GetBool(objectId + "VectorSubLayerProperties_showTexturing");
}
set
{
EditorPrefs.SetBool(objectId + "VectorSubLayerProperties_showTexturing", value);
}
}
=======
static float colorCellSize = 16.0f;... |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Threading;
=======
>>>>>>>
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Threading;
<<<<<<<
public abstract Task SendActivities(IBotContext context, IEnumerable<Activit... |
<<<<<<<
this TSoapClient client, IEnumerable<Func<string, string, SoapEnvelope, SoapEnvelope>> handlers)
=======
this TSoapClient client, IEnumerable<Func<string, SoapEnvelope, SoapEnvelope>> handlers, bool append = false)
>>>>>>>
this TSoapClient client, IEnumerable<Func<string, ... |
<<<<<<<
string serializedJson = SimpleJson.SimpleJson.SerializeObject(request, Util.ApiSerializerStrategy);
=======
if (_authKey == null) throw new Exception("Must be logged in to call this method");
string serializedJson = JsonConvert.SerializeObject(request, Util.Js... |
<<<<<<<
NoteView.LoadScore(book.Score);
NoteViewScrollBar.Value = 0;
=======
NoteView.Load(book.Score.Notes);
NoteViewScrollBar.Value = NoteViewScrollBar.GetMaximumValue();
>>>>>>>
NoteView.LoadScore(book.Score);
NoteViewScrollBar.Value = NoteVi... |
<<<<<<<
/// <summary>
/// Create a new viewport
/// </summary>
=======
>>>>>>>
/// <summary>
/// Create a new viewport
/// </summary> |
<<<<<<<
_map.Viewport.ViewChanged(true);
PushSizeOntoViewport();
=======
_map.ViewChanged(true);
PushSizeOntoViewport(Width, Height);
>>>>>>>
_map.Viewport.ViewChanged(true);
PushSizeOntoViewport(W... |
<<<<<<<
using KeeAnywhere.StorageProviders.AmazonDrive;
=======
using KeeAnywhere.StorageProviders.AmazonS3;
>>>>>>>
using KeeAnywhere.StorageProviders.AmazonDrive;
using KeeAnywhere.StorageProviders.AmazonS3;
<<<<<<<
new StorageDescriptor(StorageType.AmazonDrive, "Amazon Drive", "adrive", account => ne... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using DotNet2019.Api;
=======
using DotNet2019.Api;
>>>>>>>
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using DotNet2019.Api;
<<<<<<<
Configuratio... |
<<<<<<<
using Microsoft.Bot.Builder.Core.Extensions;
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime;
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime.Models;
=======
using Microsoft.Cognitive.LUIS.Models;
>>>>>>>
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime;
using Micros... |
<<<<<<<
public class RandomPoolSurrogate : ISurrogate
{
public int NrOfInstances { get; set; }
public bool UsePoolDispatcher { get; set; }
public Resizer Resizer { get; set; }
public SupervisorStrategy SupervisorStrategy { get; set; }
public s... |
<<<<<<<
}
private static string NormalizedIntent(string intent) => intent.Replace('.', '_').Replace(' ', '_');
=======
}
private static string NormalizedIntent(string intent)
{
return intent.Replace('.', '_').Replace(' ', '_');
}
>>>>>>>
}
... |
<<<<<<<
if (local.Resizer != null)
throw new ConfigurationException("Resizer can't be used together with cluster router.");
_settings = settings;
_local = local;
=======
Settings = settings;
Local = local;
Guard.Assert(local.Resi... |
<<<<<<<
public class InterfaceConverter<T> : JsonConverter, IObservableConverter, IObservableJsonConverter
=======
/// <summary>
/// Converts an object to and from JSON.
/// </summary>
/// <typeparam name="T">The object type.</typeparam>
public class InterfaceConverter<T> : JsonConverter, IObs... |
<<<<<<<
[JsonIgnore]
private bool exclusiveSelfAssignedRoles = false;
public bool ExclusiveSelfAssignedRoles
{
get { return exclusiveSelfAssignedRoles; }
set
{
exclusiveSelfAssignedRoles = value;
if (!SpecificConfigurati... |
<<<<<<<
=======
using Discord.API;
using Embed = Discord.API.Embed;
using EmbedAuthor = Discord.API.EmbedAuthor;
using EmbedField = Discord.API.EmbedField;
using System.Net.Http;
>>>>>>>
using System.Net.Http;
<<<<<<<
public async Task WhosPlaying([Remainder] string game = null)
=======
public asy... |
<<<<<<<
var embed = new EmbedBuilder().WithColor(NadekoBot.OkColor)
.WithDescription(animeData.Synopsis)
.WithTitle(animeData.title_english)
.WithUrl(animeData.Link)
.WithImageUrl(animeData.image_url_lge)
... |
<<<<<<<
=======
using Discord.API;
using NadekoBot.Extensions;
>>>>>>>
using Discord.API;
using NadekoBot.Extensions;
<<<<<<<
public EmbedBuilder GetEmbed() =>
new EmbedBuilder().WithColor(NadekoBot.OkColor)
=======
public Embed GetEmbed() =>
new EmbedBuilder().WithOkColor(... |
<<<<<<<
return new BindingBuilder<T>(binding, this.KernelInstance, service.Format());
#endif
=======
return new BindingBuilder<T>(binding, this.Settings, service.Format());
>>>>>>>
return new BindingBuilder<T>(binding, this.Settings, service.Format());
#endif
<<<<<<<
... |
<<<<<<<
#if PCL
throw new NotImplementedException();
#else
var plugins = Kernel.Components.GetAll<IModuleLoaderPlugin>();
=======
var plugins = KernelConfiguration.Components.GetAll<IModuleLoaderPlugin>();
>>>>>>>
#if PCL
throw new NotImplementedException();
#else
... |
<<<<<<<
return new BindingBuilder<T1, T2>(firstBinding.BindingConfiguration, this.KernelInstance, string.Join(", ", serviceNames));
=======
return new BindingBuilder<T1, T2>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", servceNames));
>>>>>>>
return new Bindi... |
<<<<<<<
#if PCL
throw new NotImplementedException();
#else
Ensure.ArgumentNotNull(attributeType, "attributeType");
=======
>>>>>>>
#if PCL
throw new NotImplementedException();
#else
<<<<<<<
#if PCL
throw new NotImplementedException();
#else
Ensure.Argument... |
<<<<<<<
public float __PAD00;
=======
>>>>>>>
<<<<<<<
=======
// Build SATs
// ComputeSAT( new System.IO.FileInfo( "Dummy.png" ), new System.IO.FileInfo( "DummySAT.dds" ) );
// ComputeSAT( new System.IO.FileInfo( "StainedGlass.png" ), new System.IO.FileInfo( "AreaLightSAT.dds" ) );
// ComputeSAT( new System.I... |
<<<<<<<
_window.SetSelectionOfMenuItem("FutureTasks", User.Default.FilterFutureTasks);
=======
_window.SetSelectionOfMenuItem("HiddenTasks", User.Default.ShowHidenTasks);
>>>>>>>
_window.SetSelectionOfMenuItem("FutureTasks", User.Default.FilterFutureTasks);
... |
<<<<<<<
using Microsoft.Win32;
=======
using System.Windows.Threading;
>>>>>>>
using Microsoft.Win32;
using System.Windows.Threading; |
<<<<<<<
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool FilterFutureTasks {
get {
return ((bool)(th... |
<<<<<<<
[Obsolete("This member has been renamed `IsProtected` to better reflect its purpose.")]
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
=======
public bool IsWatched { get; set; }
>>>>>>>
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] |
<<<<<<<
public WorkspacesResourceGroup Workspaces => new WorkspacesResourceGroup(this);
public async Task<ResourceGroup> LoadResourceGroupAsync(string name)
=======
public async Task<ResourceGroup> LoadResourceGroupAsync(string name, CancellationToken token = default)
>>>>>>>
public ... |
<<<<<<<
var request = reference.GetContinuationActivity().ApplyConversationReference(reference, true);
=======
if (reference == null)
{
throw new ArgumentNullException(nameof(reference));
}
if (logic == null)
{
th... |
<<<<<<<
private double moonEjectionAngle;
private double ejectionAltitude;
private double targetBodyDeltaV;
=======
>>>>>>>
private double moonEjectionAngle;
private double ejectionAltitude;
private double targetBodyDeltaV;
<<<<<<<
private double CalculateDeltaV(CelestialBody dest) //calculates ... |
<<<<<<<
public override HttpRequestMessage CreateRequest(string url, string method)
=======
/// <inheritdoc/>
public override HttpWebRequest CreateRequest(string url, string method)
>>>>>>>
/// <inheritdoc/>
public override HttpRequestMessage CreateRequest(string url, string m... |
<<<<<<<
public async Task<SubredditStyle> GetStylesheetAsync()
=======
/// <summary>
/// Get the subreddit stylesheet.
/// </summary>
public SubredditStyle Stylesheet
>>>>>>>
/// <summary>
/// Get the subreddit stylesheet.
/// </summary>
public ... |
<<<<<<<
#endregion
public async Task<IEnumerable<string>> GetPageNamesAsync()
=======
/// <summary>
/// Get a list of wiki page names for this subreddit.
/// </summary>
public IEnumerable<string> PageNames
>>>>>>>
#endregion
/// <summary>
/// ... |
<<<<<<<
=======
#region Obsolete Getter Methods
[Obsolete("Use Thread property instead")]
public Listing<PrivateMessage> GetThread()
{
return Thread;
}
#endregion Obsolete Gettter Methods
>>>>>>>
<<<<<<<
=======
public void SetAsRead()
... |
<<<<<<<
public Task DownvoteAsync()
=======
/// <summary>
/// Downvote this item.
/// </summary>
public void Downvote()
>>>>>>>
/// <summary>
/// Downvote this item.
/// </summary>
public Task DownvoteAsync()
<<<<<<<
public async Task ... |
<<<<<<<
=======
/// <summary>
/// DEPRECATED: Avoid use as Reddit will be removing this option eventually
/// </summary>
/// <param name="username"></param>
/// <param name="password"></param>
/// <param name="useSsl"></param>
[Obsolete("OAuth is recommended.", ... |
<<<<<<<
=======
using EnvDTE;
using Microsoft.VisualStudio.TextManager.Interop;
using NGit.Api;
>>>>>>>
<<<<<<<
using CancellationToken = System.Threading.CancellationToken;
=======
using System.Diagnostics;
using TextRange = System.Windows.Documents.TextRange;
>>>>>>>
using CancellationToken = System.Threading.... |
<<<<<<<
private readonly ITextBuffer _documentBuffer;
=======
private readonly FileSystemWatcher _watcher;
>>>>>>>
private readonly ITextBuffer _documentBuffer;
private readonly FileSystemWatcher _watcher;
<<<<<<<
public ITextBuffer DocumentBuffer
{
get
... |
<<<<<<<
{ ExpressionType.Dialog, "dialog." },
=======
{ ExpressionType.SimpleEntity, "turn.recognized.entities." },
{ ExpressionType.Title, "dialog." },
>>>>>>>
{ ExpressionType.Dialog, "dialog." },
{ ExpressionType.SimpleEntity, "turn.recognized.entities."... |
<<<<<<<
using FluentAssertions;
using NUnit.Framework;
=======
using FluentAssertions;
>>>>>>>
using FluentAssertions;
using NUnit.Framework;
<<<<<<<
=======
using NUnit.Framework;
>>>>>>>
<<<<<<<
[Test]
public void Command_should_create_new_aggregate_root_with_static_method()
{
... |
<<<<<<<
}
private static string NormalizedIntent(string intent) => intent.Replace('.', '_').Replace(' ', '_');
=======
}
private static string NormalizedIntent(string intent)
{
return intent.Replace('.', '_').Replace(' ', '_');
}
>>>>>>>
}
... |
<<<<<<<
using Microsoft.AspNet.Hosting;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.Internal;
=======
>>>>>>>
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.Internal; |
<<<<<<<
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime;
using Microsoft.Bot.Builder.Core.Extensions;
using Newtonsoft.Json.Linq;
=======
using Microsoft.Cognitive.LUIS.Models;
using Newtonsoft.Json.Linq;
>>>>>>>
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime;
using Newtonsoft.Json.Linq; |
<<<<<<<
nameof(IsMarkerClicked),
typeof(bool),
typeof(MapView),
default(bool),
BindingMode.TwoWay
);
=======
nameof(IsMarkerClicked),
typeof(bool),
typeof(MapView),
default(bool),
BindingMode.TwoWay
... |
<<<<<<<
Annotations = new ObservableCollection<Annotation> {
new PointAnnotation {
Coordinate = new Position(21.004142f, 105.847607f),
Title = "Naxam Company Limited",
SubTitle = "A software development agency from Hanoi, Vietnam"
... |
<<<<<<<
var activity = (AppCompatActivity)Context;
var view = new Android.Widget.FrameLayout(Context)
=======
var activity = (AppCompatActivity)Context;
var view = new Android.Widget.FrameLayout(activity)
>>>>>>>
var activity = (AppCompa... |
<<<<<<<
logError("Exported method name is null or empty, method: {0} (0x{1:X8})", new object[] { info.Method, info.Method.MDToken.Raw });
=======
error = true;
logError("Exported method name is null or empty, method: {0} (0x{1:X8})", info.Method, info.Method.MDToken.Raw);
>>>>>>>
error = true;
... |
<<<<<<<
// This file was auto-generated by 'NAnt.BuildTools.Tasks' version '1.0.0.0' from 'ProductVersion.xml'
using System.Reflection;
using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("1.2.1505.1")]
[assembly: AssemblyConfiguration("")]
=======
// This file is auto-generated
using System.Reflection... |
<<<<<<<
using Microsoft.Bot.Builder.Dialogs.Declarative;
=======
using Microsoft.Bot.Builder.Dialogs.Declarative.Debugger;
using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
>>>>>>>
using Microsoft.Bot.Builder.Dialogs.Declarative.Debugger;
using Microsoft.Bot.Builder.Dialogs.Declarative;
<<<<<<<
... |
<<<<<<<
Dictionary<string, string> renames = null;
var renamesFile = Path.Combine(resourceInfo.FullPath, "renames.txt");
if (io::File.Exists(renamesFile))
{
renames = (from l in io::File.ReadAllLines(renamesFile)
where !string.I... |
<<<<<<<
public BrokeredMessageFactory(ReplyQueueNameSetting replyQueueName, GzipMessageCompressionSetting gzipCompression, IClock clock)
=======
public BrokeredMessageFactory(ReplyQueueNameSetting replyQueueName, ISerializer serializer, IClock clock)
>>>>>>>
public BrokeredMessageFactory(Repl... |
<<<<<<<
m_localfile.Protected = false;
=======
if (m_localFileStream != null)
try { m_localFileStream.Dispose(); }
finally { m_localFileStream = null; }
>>>>>>>
m_localfile.Protected = false;
if (m_localFileStream != null)
... |
<<<<<<<
public void RunNoMetadata()
{
PrepareSourceData();
RunCommands(1024 * 10, modifyOptions: opts => {
opts["skip-metadata"] = "true";
});
}
[Test]
=======
[Category("Border")]
>>>>>>>
[Category("Border")]
... |
<<<<<<<
var enumeratorTask = Backup.FileEnumerationProcess.Run(sources, snapshot, null, options.FileAttributeFilter, sourcefilter, filter, options.SymlinkPolicy, options.HardlinkPolicy, options.ChangedFilelist, taskreader);
=======
var enumeratorTask = Backup.FileEnumerationProcess.Ru... |
<<<<<<<
using(new Logging.Timer(LC.L("ExecuteNonQuery: {0}", self.GetPrintableCommandText())))
=======
using(new Logging.Timer(LOGTAG, "ExecuteNonQuery", string.Format("ExecuteNonQuery: {0}", self.CommandText)))
>>>>>>>
using(new Logging.Timer(LOGTAG, "ExecuteNonQuery", string.For... |
<<<<<<<
m_selectremotevolumeCommand.CommandText = m_selectremotevolumesCommand.CommandText + @" WHERE ""Name"" = ?";
=======
m_selectduplicateRemoteVolumesCommand.CommandText = string.Format(@"SELECT DISTINCT ""Name"", ""State"" FROM ""Remotevolume"" WHERE ""Name"" IN (SELECT ""Name"" FROM ""R... |
<<<<<<<
/// <param name="filehash">The hash of the metadata</param>
/// <param name="size">The size of the metadata</param>
/// <param name="blocksetid">The ID of the blockset with the data</param>
/// <param name="transaction">The transaction to use</param>
=======
/// <param ... |
<<<<<<<
/// <summary>
/// Retrieves change journal data for file set
/// </summary>
/// <param name="fileSetId">Fileset-ID</param>
public IEnumerable<Interface.USNJournalDataEntry> GetChangeJournalData(long fileSetId)
{
var data = new List<Interface.USNJourna... |
<<<<<<<
log.AddWarning(Strings.RSyncDir.SnapshotFailedError(ex.ToString()), ex);
=======
{
log.AddWarning(Strings.Common.SnapshotFailedError(ex.ToString()), ex);
}
>>>>>>>
log.AddWarning(Strings.Common.SnapshotFailedError(ex.... |
<<<<<<<
Utility.UpdateOptionsFromDb(db, m_options);
=======
if (db.RepairInProgress)
m_result.AddWarning("The database is marked as \"in-progress\" and may be incomplete.", null);
>>>>>>>
Utility.UpdateOptionsFromDb(db, m_opt... |
<<<<<<<
var req = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(m_baseUri + LOGIN_SCRIPT + "?get-nonce=1");
req.Method = "GET";
req.UserAgent = "Duplicati TrayIcon Monitor, v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
req.... |
<<<<<<<
new CommandLineArgument("exclude-empty-folders", CommandLineArgument.ArgumentType.Boolean, Strings.Options.ExcludeemptyfoldersShort, Strings.Options.ExcludeemptyfoldersLong, "false"),
=======
new CommandLineArgument("ignore-filenames", CommandLineArgument.ArgumentType... |
<<<<<<<
=======
PreBackupVerify(backend);
// Verify before uploading a synthetic list
m_database.VerifyConsistency(null, m_options.Blocksize, m_options.BlockhashSize);
UploadSyntheticFilelist(backend);
... |
<<<<<<<
public static Task Run(IEnumerable<string> sources, Snapshots.ISnapshotService snapshot, UsnJournalService journalService, FileAttributes attributeFilter, Duplicati.Library.Utility.IFilter sourcefilter, Duplicati.Library.Utility.IFilter emitfilter, Options.SymlinkStrategy symlinkPolicy, Options.Hardlink... |
<<<<<<<
// Runtime Version:4.0.30319.296
=======
// Runtime Version:4.0.30319.1
>>>>>>>
// Runtime Version:4.0.30319.1
<<<<<<<
/// Looks up a localized string similar to When using the foresthash storage method, the option --{0} must be set.
/// </summary>
internal static strin... |
<<<<<<<
if (result.ParsedResult != Library.Interface.ParsedResultType.Success)
{
var type = result.ParsedResult == Library.Interface.ParsedResultType.Warning
? NotificationType.Warning
: NotificationType.... |
<<<<<<<
try
{
m_is_reporting = true;
Logging.Log.WriteMessage(message, Duplicati.Library.Logging.LogMessageType.Warning, ex);
var s = ex == null ? message : string.Format("{0} => {1}", message, VerboseErrors... |
<<<<<<<
=======
private static Size m_trayIconSize = Size.Empty;
/// <summary> Set size of icons to return. </summary>
public static void SetTrayIconSize(Size useTrayIconSize)
{
lock (LOCK)
{
ICONS.Clear();
m_trayIconSize = use... |
<<<<<<<
=======
using System.Collections.Generic;
using System.IO;
using System.Text;
>>>>>>>
using System.IO;
<<<<<<<
=======
finally
{
System.Environment.SetEnvironmentVariable("SQLITE_TMPDIR", prev);
}
>>>>>>>
<<<<<<<
/// <summary>
/// S... |
<<<<<<<
ResumeDataArrived(srda.Handle, srda.ResumeData);
continue;
=======
main_thread_dispatcher.Invoke(() => ResumeDataArrived(srda.Handle, srda.ResumeData));
>>>>>>>
main_thread_dispatcher.Invoke(() => ResumeDataArrive... |
<<<<<<<
new TextButton(new Vector2(UIScaler.GetHCenter(-6f), 9f), new Vector2(12, 2), CommonStringKeys.FINISHED, delegate { Destroyer.Dialog(); });
=======
new TextButton(new Vector2(UIScaler.GetHCenter(-6f), 9f), new Vector2(12, 2), "Finished", delegate { Destroyer.Dialog(); });
MonsterDialo... |
<<<<<<<
public StringKey uniqueTitle = StringKey.NULL;
public StringKey uniqueText = StringKey.NULL;
=======
public string uniqueTitle = "";
public string uniqueText = "";
public float uniqueHealthBase = 0;
public float uniqueHealthHero = 0;
>>>>>>>
public Stri... |
<<<<<<<
using Assets.Scripts.Content;
=======
using Assets.Scripts.UI.Screens;
using System.Collections.Generic;
>>>>>>>
using Assets.Scripts.Content;
using Assets.Scripts.UI.Screens;
using System.Collections.Generic; |
<<<<<<<
public StringKey ability = null;
public StringKey minionActions = null;
public StringKey masterActions = null;
=======
public string ability = "-";
public string minionActions = "-";
public string masterActions = "-";
public string moveButton = "";
public string move = "";
>>>... |
<<<<<<<
new TextButton(new Vector2(hOffset, offset), new Vector2(length, 2),
eb.label, delegate { onButton(numTmp); }, eb.colour);
=======
new TextButton(new Vector2(hOffset, offset), new Vector2(buttonWidth, 2),
new StringKey(eb.label,false), delegate { onBut... |
<<<<<<<
using Assets.Scripts.Content;
using UnityEngine;
=======
using UnityEngine;
using System.Collections;
using System.Collections.Generic;
>>>>>>>
using Assets.Scripts.Content;
using UnityEngine;
using System.Collections;
using System.Collections.Generic;
<<<<<<<
DialogBox db = new DialogBox(
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.