Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2021-11-29 07:51:09Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (13):
  Sharpe49
  twpol
  cjakeman
  pzgulyas
  YoRyan
  perpetualKid
  strawberryfield
  cesarBLG
  peternewell
  Csantucci
  wjcurrey
  markus-GE
  mbm-OR
Open pull requests (11):
  #57 Ensure that build fails when tests fail to run
    By:     twpol
    Branch: bugfix/net4-test-runner
    Labels: not-for-unstable
    Allowed to auto-merge? False
  #510 Add performance monitoring for diesel mechanic locomotives and new parameters
    By:     peternewell
    Branch: diesel-mechanic#1
    Labels: enhancement
    Allowed to auto-merge? True
  #524 Further strings translation
    By:     Weter-ORTS
    Branch: master
    Labels: locales
    Allowed to auto-merge? False
  #525 Add SignalTypeName and DrawStateName to SignalFeatures
    By:     Sharpe49
    Branch: tcs-extensions
    Labels: enhancement
    Allowed to auto-merge? True
  #527 Brake cuts power refactor and new parameters
    By:     Sharpe49
    Branch: brake-cuts-power-refactor
    Labels: enhancement
    Allowed to auto-merge? True
  #531 Bug fix for https://bugs.launchpad.net/or/+bug/1950578 Dyn Brake setup state not disappearing in cab
    By:     Csantucci
    Branch: dynbrake-display-fix
    Labels: bug
    Allowed to auto-merge? True
  #532 Distributed power american style. Blueprint https://blueprints.launchpad.net/or/+spec/distributed-power
    By:     Csantucci
    Branch: distributed-power-official
    Labels: enhancement
    Allowed to auto-merge? True
  #533 fix for shapes hidden by animations( 0 )
    By:     cjakeman
    Branch: fix-for-hidden-shapes
    Labels: bug
    Allowed to auto-merge? True
  #534 deletes RunActivityLAA.* post-build
    By:     cjakeman
    Branch: delete-RunActivityLAA
    Labels: enhancement
    Allowed to auto-merge? True
  #537 C# signal script extensions
    By:     Sharpe49
    Branch: csharp-script-extensions
    Labels: enhancement refactoring
    Allowed to auto-merge? True
  #538 Delete binary paths if the ascii version or the tdb was modified. Blueprint: https://blueprints.launchpad.net/or/+spec/binary-timetable-paths
    By:     pzgulyas
    Branch: preprocesspaths
    Labels: enhancement
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (9):
  #510 Add performance monitoring for diesel mechanic locomotives and new parameters
  #525 Add SignalTypeName and DrawStateName to SignalFeatures
  #527 Brake cuts power refactor and new parameters
  #531 Bug fix for https://bugs.launchpad.net/or/+bug/1950578 Dyn Brake setup state not disappearing in cab
  #532 Distributed power american style. Blueprint https://blueprints.launchpad.net/or/+spec/distributed-power
  #533 fix for shapes hidden by animations( 0 )
  #534 deletes RunActivityLAA.* post-build
  #537 C# signal script extensions
  #538 Delete binary paths if the ascii version or the tdb was modified. Blueprint: https://blueprints.launchpad.net/or/+spec/binary-timetable-paths
Preparing repository...
  > git --no-pager fetch --update-head-ok
  > git --no-pager reset --hard
  < HEAD is now at 3ab29e1b4 Automatic merge of T1.4-68-g723f722c7 and 7 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 723f722c7800227dc81fb048872af25b9ee0998c
Merging #510 Add performance monitoring for diesel mechanic locomotives and new parameters...
  > git --no-pager merge --quiet --no-edit --no-ff ca2494dd7ba70948d83eb85cd58c5a0619857944
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Common/Scripting/PowerSupply/PowerSupply.cs
Merging #525 Add SignalTypeName and DrawStateName to SignalFeatures...
  > git --no-pager merge --quiet --no-edit --no-ff b5ac1d25a7a04277371fd98dc90255ede93a7cd4
Merging #527 Brake cuts power refactor and new parameters...
  > git --no-pager merge --quiet --no-edit --no-ff 95b52ab19b40f485dfb31cc3bce3d64926fdb619
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
Merging #531 Bug fix for https://bugs.launchpad.net/or/+bug/1950578 Dyn Brake setup state not disappearing in cab...
  > git --no-pager merge --quiet --no-edit --no-ff b2affac45986a87e7c0d119ff88f7fea37b03681
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
Merging #532 Distributed power american style. Blueprint https://blueprints.launchpad.net/or/+spec/distributed-power...
  > git --no-pager merge --quiet --no-edit --no-ff 71966556f5588fcfd97b638eb6e03fc78dd2ef71
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 3e98a440b Merge commit 'b2affac45986a87e7c0d119ff88f7fea37b03681' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff 71966556f5588fcfd97b638eb6e03fc78dd2ef71 failed: 1
Merging #533 fix for shapes hidden by animations( 0 )...
  > git --no-pager merge --quiet --no-edit --no-ff 62a1c271c1072bc3a4d5dbf0756455587ffc210f
Merging #534 deletes RunActivityLAA.* post-build...
  > git --no-pager merge --quiet --no-edit --no-ff ba3f85a071407933c4a497d1eb6fb190a0c29da7
Merging #537 C# signal script extensions...
  > git --no-pager merge --quiet --no-edit --no-ff 2fbbe40bfc583c8c295294260f7d23f8c78b6e09
  < Auto-merging Source/RunActivity/Viewer3D/Popups/SignallingDebugWindow.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/SignallingDebugWindow.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at fbc769ca2 Merge commit 'ba3f85a071407933c4a497d1eb6fb190a0c29da7' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff 2fbbe40bfc583c8c295294260f7d23f8c78b6e09 failed: 1
Merging #538 Delete binary paths if the ascii version or the tdb was modified. Blueprint: https://blueprints.launchpad.net/or/+spec/binary-timetable-paths...
  > git --no-pager merge --quiet --no-edit --no-ff c457f11cda5b9a773626f3b405e3ff7ec1055ada
Pull requests successfully auto-merged (7):
  #510 Add performance monitoring for diesel mechanic locomotives and new parameters
  #525 Add SignalTypeName and DrawStateName to SignalFeatures
  #527 Brake cuts power refactor and new parameters
  #531 Bug fix for https://bugs.launchpad.net/or/+bug/1950578 Dyn Brake setup state not disappearing in cab
  #533 fix for shapes hidden by animations( 0 )
  #534 deletes RunActivityLAA.* post-build
  #538 Delete binary paths if the ascii version or the tdb was modified. Blueprint: https://blueprints.launchpad.net/or/+spec/binary-timetable-paths
Pull requests not auto-merged (2):
  #532 Distributed power american style. Blueprint https://blueprints.launchpad.net/or/+spec/distributed-power
  #537 C# signal script extensions
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2021-11-29 07:51:17Z