VladimirMakaev

train22 landing trains

Built on rrnewton/hermit main cd9e333e8429 and rrnewton/reverie main 9443a6b28257. Branches (no PRs): VladimirMakaev/hermit and VladimirMakaev/reverie train22/<N>-<slug>. Each cluster is one linear branch on the previous one's tip; each PR's own commits are cherry-picked with their messages, authors and author dates unchanged, and every collision is resolved by a separate Train N: resolve ... commit right after the PR that meets it. Where a cherry-pick met a conflict the resolvers could not merge line by line, the PR commit takes the PR's side of that hunk (or the train's, where the PR's side was already in the train) and the resolution commit after it restores the other side. Two kinds of hunk are merged inside the pick because they need no judgment: version and test-count pins (arithmetic), and comment-only hunks where one side only appends sentences (the other side's text, then the appended sentences, rewrapped).

Train 1: train22/1-reverie-pin at 3a720d6d23ca

Reve

VladimirMakaev

{
  "sched_turns": 26,
  "schedevent_replayed": 0,
  "schedevent_recorded": 0,
  "schedevent_desynced": 0,
  "desync_descrip": null,
  "reprio_descrip": null,
  "threads_descrip": "[3 5 7]",
  "num_processes": 1,
  "num_threads": 3,

VladimirMakaev

#!/usr/bin/env python3
"""
ventoy-macos-install.py - Install Ventoy on a USB drive from macOS.

This script installs Ventoy on a USB drive without requiring macFUSE,
Linux, or a VM. It writes the GPT partition table, boot code, and
EFI partition image directly to the raw block device.

Usage:
    sudo python3 ventoy-macos-install.py /dev/diskN [--exfat|--ntfs] [--ventoy-version VERSION]

VladimirMakaev

#$env:path += ";" + (Get-Item "Env:ProgramFiles(x86)").Value + "\Git\bin"
#ls C:\tools\poshgit -Recurse profile.example.ps1 | select -First 1 | foreach-object { ."$($_.FullName)"}

#if(Test-Path 'C:\Program Files\Microsoft Virtual Machine Converter\MvmcCmdlet.psd1'){
#	Import-Module 'C:\Program Files\Microsoft Virtual Machine Converter\MvmcCmdlet.psd1'
#}


if(Test-Path 'c:\PSLocal'){

VladimirMakaev

using System;
using System.Collections.Generic;
using System.Data.Entity;
using System.Reflection;

using Anybill.Renaissance.Common;

using Autofac;
using Autofac.Builder;
using Autofac.Core;

VladimirMakaev

 public class FilePathResolver : IFilePathResolver, ISingletonDependency
    {
        private readonly string baseDirectory;

        public FilePathResolver(string baseDirectory)
        {
            this.baseDirectory = baseDirectory;
        }

        #region IFilePathResolver Members

VladimirMakaev

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

VladimirMakaev

///<reference path='..\node\node.d.ts' />

declare module "express" {
   export function createServer(): ExpressServer;
   export function static(path: string): any;
   import http = module("http");
   export var listen;

  // Connect middleware
   export function bodyParser(options?:any): (req: ExpressServerRequest, res: ExpressServerResponse, next) =>void;