Patch补丁输出的含义

一直对patch补丁输出不是很清晰,今天做了个例子对比,如下:

#He bo add it for test
#He bo add it for test
#He bo add it for test
# Copyright (C) 2008 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

ifneq ($(TARGET_SIMULATOR),true)
include $(call all-subdir-makefiles)
endif
#He bo add it for test
#He bo add it for test
#He bo add it for test

对于以上修改,其中“He bo add it for test”是后加的,补丁的结果如下:

此处-1,6表示左边的文件“-”的当前行为(左边表示为-)1行,上下文以及-这一行总共有6行,右边当前行为(右边表示为+)1行,上下文以及+的行数总共为8行。

@@ -1,6 +1,8 @@
-#
+#He bo add it for test
+#He bo add it for test
+#He bo add it for test
# Copyright (C) 2008 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

此处表示当前行为15行,总共有5行,右边当前行为17行,总共有8行。
@@ -15,5 +17,8 @@
#

ifneq ($(TARGET_SIMULATOR),true)
include $(call all-subdir-makefiles)
endif
+#He bo add it for test
+#He bo add it for test
+#He bo add it for test

你可能感兴趣的:(pat)