Esi sikhokelo sibonelela ngophawu olusisiseko sokusebenzisa ipakethi kwinkqubo okanye kwifayile.

Umyalelo osetshenziselwa ukusebenzisa iifakethi ngumyalelo wokupakisha kodwa ukuze usebenzise i-patch umyalelo okhuselekileyo kufuneka usebenzise ukubonelela ukungafani okufuneka ukutyunjwa.

Kutheni Unokwenza I-Patch

Cinga ukuba unayo ifayile ye HTML ngendlela elandelayo:

MySite

Mkelekile kwi-MySite

Umthombo ongentla apha xa ulayishwa kwisiphequluli sewebhu uza kubonisa amagama "Siyakwamkela kwi-MySite".

Kuqhelekile xa inkqubo yekho iguqulela ezininzi iifayile enye. Ngokomzekelo kwakuya kubakho enye inguqu ekhompyutheni ekhoyo ekhoyo, kuya kubakho enye inguqu kwisebe lophuhliso elinokuba neenguqu ezininzi, ekugqibeleni kunokukho enye inguqu kwifayile yokukhululwa.

Ukukhutshwa kwesebe kuya kuba yinguqu esebenzisiweyo abasebenzisi bokwenene (oko kukule meko kwindwendwe kwiwebsite ye-MySite). Makhe sithi i-MySite i-version 1.0. Emva kwesigaba sophuhliso uza kudala igatsha lokukhululwa eliya kuba lile meko 1.1. Isebe lophuhliso luza kuba phambi kwesebe lokukhululwa ngenxa yokuba lingaqukatha utshintsho olungafanelekanga ukukhutshwa kwi-version 1,2 kodwa luya kuba ngu-1.1.

Khawucinge nje kwakukho igciwane apho i-MySite ibizwa ngokuba yi-YourSite. Unako ukuya kwesebe ngalinye kwaye wenze utshintsho kwinguqu ephilayo, inguqu yokuphuhliswa kunye neenguqulelo zokukhutshwa kwakho ungenza utshintsho njengendlela yokutshisa okutshintshileyo ekukholeni kwaye usetyenzise iqhosha kumaziko okuphuhlisa nokukhupha.

Umzekelo oSebenzayo

Yakha ifayile ebizwa ngefayile.html ngekhodi elandelayo kuyo:

MySite

Mkelekile kwi-MySite

Lo ngumzekelo osebenzayo wokukhangela ikhowudi yomthombo.

Yakha enye ifayile ebizwa ngokuthi myfile_v2.html ngekhodi elandelayo kuyo:

Yakho

Siyakwamukela Kwi-YourSite

Lo ngumzekelo osebenzayo wokukhangela ikhowudi yomthombo.

Ifayili yokuqala yiphepha lewebhu lokuqala kunye nesihloko esithi "Siyakwamkela kwi-MySite". Ifayile ye sibini ifana nefayile yokuqala ngaphandle kwe-MyFile ibhalwe kwakhona kwi-YourFile kwisicatshulwa.

Indlela yokudala iFayile ehlukileyo

Ukuze senze i-patch kufuneka sisebenze ukungafani phakathi kwefayile.html kunye ne-myfile_v2.html.

Sokukwenza ngoku umyalelo ohlukeneyo ngale ndlela:

diff -u myfile.html myfile_v2.html> myfile.patch

Unokuvula ifayile yefayile.fayile kwi -nano editor njengendlela elandelayo ukuyijonga:

nano myfile.patch

Imigqa engatshintshiyo iboniswa eluhlaza okwesibhakabhaka. Imigca ekhutshweyo iboniswa ebomvu kwaye imigca eye yongezwa iboniswa eluhlaza.

Indlela yokufaka isicelo sePatch usebenzisa i-Patch Command

Ukufaka iqhosha kwi -file yami.html sebenzisa umyalelo olandelayo:

patch

Indlela yokubuyisela iPatch

Oku kuya kusebenzisa utshintsho olwenziwe usebenzisa umyalelo ohlukileyo kwifayile yangaphambili yefayile.

Ukuba ufuna ukubuyisela i-patch ukuze i-myfile.html ibuyele endleleni eyawusebenzisa ngayo umyalelo olandelayo:

iqhosha-R

Isishwankathelo

Umyalelo wokupakisha ungasetyenziselwa ukufaka iifayile kuzo zonke izikhokelo zekhowudi.

Kukho izixhobo ezingcono kakhulu kunomyalelo wokupakisha wokudala iipatches kunye nokuqinisekisa ukulawulwa kakuhle komthombo.

Kukho isizathu sokuba iiprojekthi ezininzi zophuhliso zisebenzisa i-GIT yokulawula umthombo. I-GIT yenza kube lula ukudala isicwangciso se-branching esifanayo.

Umyalelo wokupakisha ulungile ukuba usebenzise ukungqinelana kwiskripthi somthi okanye into elula kodwa unokwenza ngokulula ukukhuphela ikopi yokukhusela yeefayili ofuna ukuyifaka kunye nokukopisha iifayile ezintsha kwindawo enye.

Ukufumana ulwazi oluninzi sebenzisa umyalelo womntu:

indoda