Patch 19721304&patch 19721304 &patch 19877440

rac2-> /u01/app/oracle/product/11.2.0/db_1/dbhome/OPatch/opatch  prereq CheckConflictAgainstOHWithDetail -ph ./

Oracle Interim Patch Installer version 11.2.0.3.6

Copyright (c) 2013, Oracle Corporation.  All rights reserved.

PREREQ session

Oracle Home       : /u01/app/oracle/product/11.2.0/db_1/dbhome

Central Inventory : /u01/app/oracle/gridbase

from           : /u01/app/oracle/product/11.2.0/db_1/dbhome/oraInst.loc

OPatch version    : 11.2.0.3.6

OUI version       : 11.2.0.4.0

Log file location : /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/opatch2015-01-23_10-18-09AM_1.log

Invoking prereq "checkconflictagainstohwithdetail"

Prereq "checkConflictAgainstOHWithDetail" passed.

OPatch succeeded.

rac2-> /u01/app/oracle/product/11.2.0/db_1/dbhome/OPatch/opatch  lsinventory

Oracle Interim Patch Installer version 11.2.0.3.6

Copyright (c) 2013, Oracle Corporation.  All rights reserved.

Oracle Home       : /u01/app/oracle/product/11.2.0/db_1/dbhome

Central Inventory : /u01/app/oracle/gridbase

from           : /u01/app/oracle/product/11.2.0/db_1/dbhome/oraInst.loc

OPatch version    : 11.2.0.3.6

OUI version       : 11.2.0.4.0

Log file location : /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/opatch2015-01-23_10-18-37AM_1.log

Lsinventory Output file location : /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/lsinv/lsinventory2015-01-23_10-18-37AM.txt

--------------------------------------------------------------------------------

Installed Top-level Products (1):

Oracle Database 11g                                                  11.2.0.4.0

There are 1 product(s) installed in this Oracle Home.

Interim patches (2) :

Patch  19121549     : applied on Wed Nov 19 15:56:47 CST 2014

Unique Patch ID:  17941614

Patch description:  "OCW Patch Set Update : 11.2.0.4.4 (19121549)"

Created on 7 Oct 2014, 01:10:30 hrs PST8PDT

Bugs fixed:

18328800, 18691572, 14525998, 18187697, 18348155, 17516024, 17387214

17750548, 17617807, 17551223, 14671408, 14207615, 18272135, 18180541

17292250, 17378618, 17500165, 18875012, 18464784, 17065496, 18848125

13991403, 17955615, 14693336, 17273020, 17238586, 17089344, 17405605

17531342, 17155238, 17159489, 18053580, 16543190, 17039197, 16317771

17947785, 10052729, 16281493, 18346135, 17481314, 18199185, 18399991

18024089, 18428146, 18352845, 18352846, 17391726, 18414137, 17001914

17927970, 14378120, 16346413, 17305100, 15832129, 15986647, 16901346

18068871, 17985714, 18536826, 16206997, 18752378, 16876500, 16429265

18343490, 18336452, 16613232, 17273003, 19276791, 12928658, 18226143

17172091, 18229842, 18053631, 16867761, 18231837, 15869775, 17483479

18729166, 17405302, 15920201, 18709496

Patch  19121551     : applied on Wed Nov 19 15:51:47 CST 2014

Unique Patch ID:  17956526

Patch description:  "Database Patch Set Update : 11.2.0.4.4 (19121551)"

Created on 9 Oct 2014, 00:44:17 hrs PST8PDT

Sub-patch  18522509; "Database Patch Set Update : 11.2.0.4.3 (18522509)"

Sub-patch  18031668; "Database Patch Set Update : 11.2.0.4.2 (18031668)"

Sub-patch  17478514; "Database Patch Set Update : 11.2.0.4.1 (17478514)"

Bugs fixed:

17288409, 17205719, 17811429, 17754782, 17726838, 13364795, 17311728

17284817, 17441661, 13645875, 18199537, 16992075, 16542886, 17446237

14565184, 17071721, 17610798, 17375354, 17449815, 17397545, 19463897

18230522, 17235750, 16360112, 13866822, 17982555, 17478514, 12905058

14338435, 13944971, 16929165, 12747740, 17546973, 14054676, 17088068

18264060, 17343514, 17016369, 17042658, 14602788, 14657740, 17332800

19211724, 13951456, 16315398, 17186905, 18744139, 16850630, 17437634

19049453, 18673304, 17883081, 18641419, 17296856, 18262334, 17006183

18277454, 17232014, 16855292, 10136473, 17705023, 17865671, 18554871

19121551, 17588480, 17551709, 17344412, 17842825, 18681862, 17390160

13955826, 13609098, 18139690, 17501491, 17239687, 17752121, 17299889

17602269, 18673325, 17313525, 17242746, 19544839, 17600719, 18191164

17571306, 19466309, 17951233, 18094246, 17165204, 17011832, 17040527

16785708, 16180763, 17477958, 17174582, 17465741, 18522509, 17323222

19463893, 16875449, 16524926, 17237521, 17596908, 17811438, 17811447

18031668, 16912439, 16494615, 18061914, 17545847, 17082359, 19554106

17614134, 17341326, 17891946, 19458377, 17716305, 17752995, 16392068

19271443, 17767676, 17614227, 17040764, 17381384, 18973907, 18673342

14084247, 17389192, 17006570, 17612828, 17721717, 13853126, 18203837

17390431, 17570240, 14245531, 16043574, 16863422, 19727057, 17468141

17786518, 17037130, 17267114, 18203838, 16198143, 16956380, 17478145

14829250, 17394950, 17027426, 16268425, 18247991, 19584068, 14458214

18436307, 17265217, 13498382, 16692232, 17786278, 17227277, 16042673

16314254, 17443671, 16228604, 16837842, 17393683, 17787259, 18009564

15861775, 16399083, 18018515, 16472716, 17050888, 14010183, 17325413

16613964, 17080436, 17036973, 17761775, 16721594, 18280813, 15979965

18203835, 17297939, 16731148, 17811456, 14133975, 17385178, 17586955

16450169, 17655634, 9756271, 17892268, 17648596, 16220077, 16069901

11733603, 16285691, 17587063, 18180390, 17393915, 18096714, 17238511

17824637, 14285317, 19289642, 14764829, 18328509, 17622427, 16943711

17346671, 18996843, 14852021, 17783588, 16618694, 17672719, 17546761

--------------------------------------------------------------------------------

OPatch succeeded.

rac2-> /u01/app/oracle/product/11.2.0/db_1/dbhome/OPatch/opatch  apply

Oracle Interim Patch Installer version 11.2.0.3.6

Copyright (c) 2013, Oracle Corporation.  All rights reserved.

Oracle Home       : /u01/app/oracle/product/11.2.0/db_1/dbhome

Central Inventory : /u01/app/oracle/gridbase

from           : /u01/app/oracle/product/11.2.0/db_1/dbhome/oraInst.loc

OPatch version    : 11.2.0.3.6

OUI version       : 11.2.0.4.0

Log file location : /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/19721304_Jan_23_2015_10_18_47/apply2015-01-23_10-18-46AM_1.log

Applying interim patch ‘19721304‘ to OH ‘/u01/app/oracle/product/11.2.0/db_1/dbhome‘

Verifying environment and performing prerequisite checks...

All checks passed.

Provide your email address to be informed of security issues, install and

initiate Oracle Configuration Manager. Easier for you if you use your My

Oracle Support Email address/User Name.

Visit http://www.oracle.com/support/policies.html for details.

Email address/User Name:

You have not provided an email address for notification of security issues.

Do you wish to remain uninformed of security issues ([Y]es, [N]o) [N]:  y

Backing up files...

Patching component oracle.rdbms.dbscripts, 11.2.0.4.0...

Verifying the update...

Patch 19721304 successfully applied

Log file location: /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/19721304_Jan_23_2015_10_18_47/apply2015-01-23_10-18-46AM_1.log

OPatch succeeded.

rac2-> /u01/app/oracle/product/11.2.0/db_1/dbhome/OPatch/opatch  lsinventory

Oracle Interim Patch Installer version 11.2.0.3.6

Copyright (c) 2013, Oracle Corporation.  All rights reserved.

Oracle Home       : /u01/app/oracle/product/11.2.0/db_1/dbhome

Central Inventory : /u01/app/oracle/gridbase

from           : /u01/app/oracle/product/11.2.0/db_1/dbhome/oraInst.loc

OPatch version    : 11.2.0.3.6

OUI version       : 11.2.0.4.0

Log file location : /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/opatch2015-01-23_10-30-24AM_1.log

Lsinventory Output file location : /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/lsinv/lsinventory2015-01-23_10-30-24AM.txt

--------------------------------------------------------------------------------

Installed Top-level Products (1):

Oracle Database 11g                                                  11.2.0.4.0

There are 1 product(s) installed in this Oracle Home.

Interim patches (3) :

Patch  19721304     : applied on Fri Jan 23 10:19:04 CST 2015

Unique Patch ID:  18113857

Created on 14 Oct 2014, 02:50:51 hrs PST8PDT

Bugs fixed:

19721304

Patch  19121549     : applied on Wed Nov 19 15:56:47 CST 2014

Unique Patch ID:  17941614

Patch description:  "OCW Patch Set Update : 11.2.0.4.4 (19121549)"

Created on 7 Oct 2014, 01:10:30 hrs PST8PDT

Bugs fixed:

18328800, 18691572, 14525998, 18187697, 18348155, 17516024, 17387214

17750548, 17617807, 17551223, 14671408, 14207615, 18272135, 18180541

17292250, 17378618, 17500165, 18875012, 18464784, 17065496, 18848125

13991403, 17955615, 14693336, 17273020, 17238586, 17089344, 17405605

17531342, 17155238, 17159489, 18053580, 16543190, 17039197, 16317771

17947785, 10052729, 16281493, 18346135, 17481314, 18199185, 18399991

18024089, 18428146, 18352845, 18352846, 17391726, 18414137, 17001914

17927970, 14378120, 16346413, 17305100, 15832129, 15986647, 16901346

18068871, 17985714, 18536826, 16206997, 18752378, 16876500, 16429265

18343490, 18336452, 16613232, 17273003, 19276791, 12928658, 18226143

17172091, 18229842, 18053631, 16867761, 18231837, 15869775, 17483479

18729166, 17405302, 15920201, 18709496

Patch  19121551     : applied on Wed Nov 19 15:51:47 CST 2014

Unique Patch ID:  17956526

Patch description:  "Database Patch Set Update : 11.2.0.4.4 (19121551)"

Created on 9 Oct 2014, 00:44:17 hrs PST8PDT

Sub-patch  18522509; "Database Patch Set Update : 11.2.0.4.3 (18522509)"

Sub-patch  18031668; "Database Patch Set Update : 11.2.0.4.2 (18031668)"

Sub-patch  17478514; "Database Patch Set Update : 11.2.0.4.1 (17478514)"

Bugs fixed:

17288409, 17205719, 17811429, 17754782, 17726838, 13364795, 17311728

17284817, 17441661, 13645875, 18199537, 16992075, 16542886, 17446237

14565184, 17071721, 17610798, 17375354, 17449815, 17397545, 19463897

18230522, 17235750, 16360112, 13866822, 17982555, 17478514, 12905058

14338435, 13944971, 16929165, 12747740, 17546973, 14054676, 17088068

18264060, 17343514, 17016369, 17042658, 14602788, 14657740, 17332800

19211724, 13951456, 16315398, 17186905, 18744139, 16850630, 17437634

19049453, 18673304, 17883081, 18641419, 17296856, 18262334, 17006183

18277454, 17232014, 16855292, 10136473, 17705023, 17865671, 18554871

19121551, 17588480, 17551709, 17344412, 17842825, 18681862, 17390160

13955826, 13609098, 18139690, 17501491, 17239687, 17752121, 17299889

17602269, 18673325, 17313525, 17242746, 19544839, 17600719, 18191164

17571306, 19466309, 17951233, 18094246, 17165204, 17011832, 17040527

16785708, 16180763, 17477958, 17174582, 17465741, 18522509, 17323222

19463893, 16875449, 16524926, 17237521, 17596908, 17811438, 17811447

18031668, 16912439, 16494615, 18061914, 17545847, 17082359, 19554106

17614134, 17341326, 17891946, 19458377, 17716305, 17752995, 16392068

19271443, 17767676, 17614227, 17040764, 17381384, 18973907, 18673342

14084247, 17389192, 17006570, 17612828, 17721717, 13853126, 18203837

17390431, 17570240, 14245531, 16043574, 16863422, 19727057, 17468141

17786518, 17037130, 17267114, 18203838, 16198143, 16956380, 17478145

14829250, 17394950, 17027426, 16268425, 18247991, 19584068, 14458214

18436307, 17265217, 13498382, 16692232, 17786278, 17227277, 16042673

16314254, 17443671, 16228604, 16837842, 17393683, 17787259, 18009564

15861775, 16399083, 18018515, 16472716, 17050888, 14010183, 17325413

16613964, 17080436, 17036973, 17761775, 16721594, 18280813, 15979965

18203835, 17297939, 16731148, 17811456, 14133975, 17385178, 17586955

16450169, 17655634, 9756271, 17892268, 17648596, 16220077, 16069901

11733603, 16285691, 17587063, 18180390, 17393915, 18096714, 17238511

17824637, 14285317, 19289642, 14764829, 18328509, 17622427, 16943711

17346671, 18996843, 14852021, 17783588, 16618694, 17672719, 17546761

--------------------------------------------------------------------------------

OPatch succeeded.

rac2->

打上该补丁:

rac2-> $ORACLE_HOME/OPatch/opatch  napply -skip_subset -skip_duplicate

Oracle Interim Patch Installer version 11.2.0.3.6

Copyright (c) 2013, Oracle Corporation.  All rights reserved.

Oracle Home       : /u01/app/oracle/product/11.2.0/db_1/dbhome

Central Inventory : /u01/app/oracle/gridbase

from           : /u01/app/oracle/product/11.2.0/db_1/dbhome/oraInst.loc

OPatch version    : 11.2.0.3.6

OUI version       : 11.2.0.4.0

Log file location : /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/opatch2015-01-23_11-36-51AM_1.log

Verifying environment and performing prerequisite checks...

Checking skip_duplicate

Checking skip_subset

These patches will be skipped because they are subset patches of some patch(es) in the Oracle Home:

17811429,17811438,17811447,18203835,18203837,18203838,19463893,19463897,19544839,19584068

OPatch continues with these patches: 18744139,19271443,19466309

Conflicts/Supersets for each patch are:

Patch : 18744139

Conflict with 19121551

Conflict details:

/u01/app/oracle/product/11.2.0/db_1/dbhome/rdbms/mesg/oraus.msb

/u01/app/oracle/product/11.2.0/db_1/dbhome/rdbms/mesg/oraus.msg

Bug Conflict with 18522509

Conflicting bugs are:

18096714,  17006570,  18554871,  17786278,  18061914,  19049453,  18744139

Bug Conflict with 17478514

Conflicting bugs are:

16450169,  17811456

Patch : 19271443

Bug Conflict with 19121551

Conflicting bugs are:

19727057,  19271443,  17343514

Bug Conflict with 18522509

Conflicting bugs are:

1868186

Bug Conflict with 18031668

Conflicting bugs are:

18139690

Bug Conflict with 17478514

Conflicting bugs are:

1755170

Patch : 19466309

Bug Conflict with 19121551

Conflicting bugs are:

19554106,  16524926,  19466309,  19458377

Bug Conflict with 18522509

Conflicting bugs are:

17600719

Following patches have conflicts: [   19121551   18744139   19271443   19466309 ]

Refer to My Oracle Support Note 1299688.1 for instructions on resolving patch conflicts.

OPatch found that the following patches are not required.

They are either subset of the patches in Oracle Home (or) subset of the patches in the given list

(or) duplicate :

17811429   17811438   17811447   18203835   18203837   18203838   19463893   19463897   19544839   19584068

UtilSession failed: After skipping conflicting patches, there is no patch to apply.

Log file location: /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/opatch2015-01-23_11-36-51AM_1.log

OPatch failed with error code 73

rac2-> cd ..

rac2-> $ORACLE_HOME/OPatch/opatch  apply

Oracle Interim Patch Installer version 11.2.0.3.6

Copyright (c) 2013, Oracle Corporation.  All rights reserved.

Oracle Home       : /u01/app/oracle/product/11.2.0/db_1/dbhome

Central Inventory : /u01/app/oracle/gridbase

from           : /u01/app/oracle/product/11.2.0/db_1/dbhome/oraInst.loc

OPatch version    : 11.2.0.3.6

OUI version       : 11.2.0.4.0

Log file location : /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/opatch2015-01-23_11-41-28AM_1.log

Failed to load the patch object.  Possible causes are:

The specified path is not an interim Patch shiphome

Meta-data files are missing from the patch area

Patch location = /u01/app/oracle/product/11.2.0/db_1/dbhome/OPatch/2/19791358

Details = PatchObject constructor: Input file "/u01/app/oracle/product/11.2.0/db_1/dbhome/OPatch/2/19791358/etc/config/actions" or "/u01/app/oracle/product/11.2.0/db_1/dbhome/OPatch/2/19791358/etc/config/inventory" does not exist.

OPatch failed: PatchObject constructor: Input file "/u01/app/oracle/product/11.2.0/db_1/dbhome/OPatch/2/19791358/etc/config/actions" or "/u01/app/oracle/product/11.2.0/db_1/dbhome/OPatch/2/19791358/etc/config/inventory" does not exist.

Log file location: /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/opatch2015-01-23_11-41-28AM_1.log

OPatch failed with error code 73

rac2-> echo $ORACLE_HOME

/u01/app/oracle/product/11.2.0/db_1/dbhome

补丁失败:

rac2-> $ORACLE_HOME/OPatch/opatch  prereq CheckConflictAgainstOHWithDetail -ph ./

Oracle Interim Patch Installer version 11.2.0.3.6

Copyright (c) 2013, Oracle Corporation.  All rights reserved.

PREREQ session

Oracle Home       : /u01/app/oracle/product/11.2.0/db_1/dbhome

Central Inventory : /u01/app/oracle/gridbase

from           : /u01/app/oracle/product/11.2.0/db_1/dbhome/oraInst.loc

OPatch version    : 11.2.0.3.6

OUI version       : 11.2.0.4.0

Log file location : /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/opatch2015-01-23_11-59-29AM_1.log

Invoking prereq "checkconflictagainstohwithdetail"

Prereq "checkConflictAgainstOHWithDetail" passed.

OPatch succeeded.

rac2-> $ORACLE_HOME/OPatch/opatch  apply

Oracle Interim Patch Installer version 11.2.0.3.6

Copyright (c) 2013, Oracle Corporation.  All rights reserved.

Oracle Home       : /u01/app/oracle/product/11.2.0/db_1/dbhome

Central Inventory : /u01/app/oracle/gridbase

from           : /u01/app/oracle/product/11.2.0/db_1/dbhome/oraInst.loc

OPatch version    : 11.2.0.3.6

OUI version       : 11.2.0.4.0

Log file location : /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/19877440_Jan_23_2015_12_00_20/apply2015-01-23_12-00-20PM_1.log

Applying interim patch ‘19877440‘ to OH ‘/u01/app/oracle/product/11.2.0/db_1/dbhome‘

Verifying environment and performing prerequisite checks...

Patch 19877440: Optional component(s) missing : [ oracle.sqlj, 11.2.0.4.0 ] , [ oracle.sqlj.companion, 11.2.0.4.0 ]

All checks passed.

Provide your email address to be informed of security issues, install and

initiate Oracle Configuration Manager. Easier for you if you use your My

Oracle Support Email address/User Name.

Visit http://www.oracle.com/support/policies.html for details.

Email address/User Name:

You have not provided an email address for notification of security issues.

Do you wish to remain uninformed of security issues ([Y]es, [N]o) [N]:  Y

Please shutdown Oracle instances running out of this ORACLE_HOME on the local system.

(Oracle Home = ‘/u01/app/oracle/product/11.2.0/db_1/dbhome‘)

Is the local system ready for patching? [y|n]

Y

User Responded with: Y

Backing up files...

Patching component oracle.javavm.server, 11.2.0.4.0...

Patching component oracle.rdbms, 11.2.0.4.0...

Patching component oracle.rdbms.dbscripts, 11.2.0.4.0...

Patching component oracle.dbjava.jdbc, 11.2.0.4.0...

Patching component oracle.dbjava.ic, 11.2.0.4.0...

Verifying the update...

--------------------------------------------------------------------------------

*******************************************************************************************************

*******************************************************************************************************

**                                ATTENTION                                                          **

**                                                                                                   **

** It is critical and essential to complete the post installation (if you are applying the patch) or **

** post deinstallation (if you are doing rollback of the patch) as per Readme to have a working      **

** and functional Oracle JavaVM Component.                                                           **

** Failure to follow the instructions could lead to inconsistencies in the database.                 **

**                                                                                                   **

*******************************************************************************************************

*******************************************************************************************************

--------------------------------------------------------------------------------

Patch 19877440 successfully applied

Log file location: /u01/app/oracle/product/11.2.0/db_1/dbhome/cfgtoollogs/opatch/19877440_Jan_23_2015_12_00_20/apply2015-01-23_12-00-20PM_1.log

OPatch succeeded.

jvm 11.2.4.2安装成功!

25-AUG-13 05.42.01.282495 AM             0 APPLY                          11.2.0.4                       Patchset 11.2.0.2.0
19-NOV-14 04.26.46.815108 PM             4 APPLY                          11.2.0.4                       PSU 11.2.0.4.4
23-JAN-15 12.11.22.800292 PM             0 jvmpsu.sql                     11.2.0.4.2OJVMBP               RAN jvmpsu.sql
23-JAN-15 12.11.22.879409 PM             0 APPLY                          11.2.0.4.2OJVMBP               OJVM PSU post-install
23-JAN-15 12.11.22.000000 PM      19877440 APPLY                                                         Patch 19877440 applied

补丁修补待续!

时间: 2024-11-08 22:54:55

Patch 19721304&patch 19721304 &patch 19877440的相关文章

diff和patch的使用、patch文件的格式解说

为了弄懂 patch中的 p0   p1    和.orig文件是啥,找到了这篇文章! 来源:http://www.cnblogs.com/super119/archive/2010/12/18/1909941.html diff和patch的使用.patch文件的格式解说 diff diff是生成源码补丁的必备工具.其命令格式为: diff [命令行选项] 原始文件 新文件 常用命令行选项如下: -r 递归处理目录 -u 输出统一格式(unified format) -N patch里包含新文

git制作补丁Patch和应用补丁Patch

1 先找到指定的提交id,比如 cc451ef67a301003bbaf5bf616e08f1a3221268e 2 到git代码目录中,敲命令制作Patch git format-patch cc451ef67a301003bbaf5bf616e08f1a3221268e 3 命令执行完成后,在当前目录生成若干个.patch的文件 把生成的.patch文件打包上传到服务器上并解压出来(步骤省略) 4 在服务器上应用补丁Patch 清除之前的错误信息 git am --abort 应用补丁 gi

diff和patch使用指南

大纲 1.概述 2.diff的用法 3.patch的用法 4.实战演练 1.概述 diff和patch是一对工具,在数学上来说,diff是对两个集合的差运算,patch是对两个集合的和运算.     diff比较两个文件或文件集合的差异,并记录下来,生成一个diff文件,这也是我们常说的patch文件,即补丁文件.     patch能将diff文件运用于 原来的两个集合之一,从而得到另一个集合.举个例子来说文件A和文件B,经过diff之后生成了补丁文件C,那么着个过程相当于 A -B = C

几个重要的shell命令:diff patch tar find grep

diff diir_1.0/ dir_2.0/ -urNB > dir_2.0.patch u:union以合并的格式来输出文件的差异信息 r:递归的对比所有的子目录下的文件 U:将不存在的文件视为空文件 B:忽略空行引起的差异 ~/dir_1.0$ patch -p1< ../dir_2.0.patch -p1的意思是忽略补丁文件中的路径一级分量:比如补丁是在home目录生成的,home目录下有dir_1.0/ dir_2.0/两个目录. 打补丁的时候进入了dir_1.0/这个目录,我就需要

git patch

-p 指定目录级别(从路径全称中除去几层目录) 如,如果补丁文件包含路径名称 /curds/whey/src/blurfl/blurfl.c,那么: -p 0 使用完整路径名 -p 1 除去前导斜杠,留下 curds/whey/src/blurfl/blurfl.c. -p 4 除去前导斜杠和前三个目录,留下 blurfl/blurfl.c -d Directory ---打补丁前,更改当前目录到指定目录 patch -N 表示严格指定应用补丁 -N  --forward  Ignore pat

【转】patch命令

原文网址:http://bbs.chinaunix.net/thread-1945698-1-1.html patch给文件1应用补丁文件变成另外一个文件2(需要先用"diff 文件1 文件2"生成补丁文件).语法patch [选项] [原始文件 [补丁文件]] 描述: patch 命令读取如何更改文件的源文件指示信息,然后应用这些更改.源文件包含由 diff 命令产生的差别列表(或者 diff 列表).差异列表是比较两个文件和构建关于如何纠正差别的指示信息的结果.缺省情况下,patc

【甘道夫】Mahout0.9 打patch使其支持 Hadoop2.2.0

引言 Mahout0.9之前的版本默认不支持Hadoop2.2.0以上版本,但很多情况下,由于集群环境的Hadoop已经是2.2.0以上版本,又必须使用Mahout,此时就需要编译源码,使得Mahout支持Hadoop2了. 欢迎转载,请注明出处: http://blog.csdn.net/u010967382/article/details/39088035 造好的车轮 让Mahout在Hadoop2.2.0上运行是需求十分广泛的,所以必定有前人已经栽好树了,我们可以在 https://iss

[转]Patch文件结构详解

N久不来 于是不知道扔在哪儿于是放这里先 如果你觉得碍事的话 帮我扔到合适的版块去.. 导读这是一篇说明文 它介绍了标准冒险岛更新文件(*.patch;*.exe)的格式文章的最后附了一段C#的参考代码 你可以自由的下载 编译 或改写为其他语言文章不附加任何有风险的可执行文件(*.exe) 对此没有兴趣的可以直接后退浏览其他帖子 目录0 前言1 文件结构  1.1 patch文件结构    1.1.1 文件头    1.1.2 zlib段  1.2 exe文件结构     1.2.1 exe段 

diff命令和patch命令

Linux就这个范儿 2.9.5 文件对比命令——diff diff命令搭建网站离不开数据库,在Linux系统上我们使用源码安装了MySQL服务器.不久我们发现 Google发布了一系列MySQL补丁,这些补丁很好很强大,这时候我们迫不及待地要把新东西更新到系统上,那就用patch命令来打补丁吧.喝水不忘打井人,那补丁又是怎么做的呢?这个任务就需要文件对比命令diff来帮忙了.diff用来比较两个文本文件的差异,是代码版本管理的基石之一.diff采用动态规划算法实现差异比较,此算法的基础是最长公

Linux diff patch

/***************************************************************************** * Linux diff patch * 声明: * 经常需要给代码打补丁,但是发现自己不会打补丁,经常看着补丁改代码,效率 * 那是一个低啊,不会就学学呗,反正patch有-R回退,不怕出错. * * 2015-12-28 深圳 南山平山村 曾剑锋 *********************************************