search

yiisoft / config

Configuration management
https://www.yiiframework.com/
BSD 3-Clause "New" or "Revised" License
31 stars 11 forks source link

Swap files in diff #79

Closed vjik closed 3 years ago

vjik commented 3 years ago

Exampl:

= Yii Config =

The local version of the "config/packages/yiisoft/view/common.php" config file differs with the new version of the file from the vendor.
Select one of the following actions:
  [1] Ignore, do nothing.
  [2] Replace the local version with the new version.
  [3] Copy the new version of the file with the ".dist" postfix.
  [4] Show diff in console.
 > 4
--- E:\xxx\vendor/yiisoft/view/config/common.php
+++ E:\xxx/config/packages/yiisoft/view/common.php
= Lines: -5,6 +5,6 =
-use Yiisoft\Definitions\DynamicReference;
+use Yiisoft\Factory\Definition\DynamicReference;
Select one of the following actions:
  [1] Ignore, do nothing.
  [2] Replace the local version with the new version.
  [3] Copy the new version of the file with the ".dist" postfix.

Now:

--- E:\xxx\vendor/yiisoft/view/config/common.php
+++ E:\xxx/config/packages/yiisoft/view/common.php
= Lines: -5,6 +5,6 =
-use Yiisoft\Definitions\DynamicReference;
+use Yiisoft\Factory\Definition\DynamicReference;

Better swap files being compared:

--- E:\xxx/config/packages/yiisoft/view/common.php
+++ E:\xxx\vendor/yiisoft/view/config/common.php
= Lines: -5,6 +5,6 =
-use Yiisoft\Factory\Definition\DynamicReference;
+use Yiisoft\Definitions\DynamicReference;