Kako uporabiti popravek v datoteko z uporabo Linuxa

by Juergen Haas

Ta priročnik vsebuje osnovni pregled uporabe obliža za program ali datoteko.

Ukaz, ki se uporablja za nanašanje popravkov, je ukaz za popravke, vendar je za uporabo patka uporabljen ukaz diff, ki ga je treba uporabiti za zagotavljanje razlik, ki jih je treba popraviti.

Zakaj si ustvaril obliž?

Predstavljajte si, da imate datoteko HTML, kot sledi:

MySite </ title> <br> </ head> <br> <telo> <br> <h1> Dobrodošli v MySite </ h1> <br> </ body> <br> </ html> </p> <p> Zgornji vir ob nalaganju v spletni brskalnik bo prikazal besede »Dobrodošli v MySite«. </p> <p> Pogosto je, če programirate več različic iste datoteke. Na primer bi obstajala ena različica, ki je trenutna različica v živo, v razvojni veji bi obstajala še ena različica, ki bi lahko vsebovala več sprememb, na koncu pa bi lahko bila še ena različica v podružnici za izdajo. </p> <p> Podružnica za izdajo bi bila različica, ki jo uporabljajo resnični uporabniki (tj. V tem primeru obiskovalci spletne strani MySite). Recimo, da je MySite na različici 1.0. Po razvojni fazi boste ustvarili podružnico, ki bi bila v tem primeru 1.1. Razvojna podružnica bi lahko bila pred podružnico za sprostitev, ker lahko vsebuje spremembe, ki niso potrebne za sprostitev v različici 1,2, vendar bo za različico 1.1. </p> <p> Predstavljajte si, da je prišlo do napake, pri katerem se MySite imenuje YourSite. Lahko bi šli v vsako podružnico in spremenili živo različico, razvojno različico in različico, ki ste jo izdali, lahko spremenite kot vročo rešitev v živo in nato uporabite obliž na razvojne in oddajne veje. </p> <h3> Delovni primer </h3><p> Ustvarite datoteko z imenom myfile.html z naslednjo kodo: </p> <p> <html> <br> <glavo> <br> <title> MySite </ title> <br> </ head> <br> <telo> <br> <h1> Dobrodošli v MySite </ h1> <br> <p> To je delovni primer za kodiranje izvorne kode. </ p> <br> </ body> <br> </ html> </p> <p> Ustvarite drugo datoteko, imenovano myfile_v2.html, z naslednjo kodo: </p> <p> <html> <br> <glavo> <br> <title> YourSite </ title> <br> </ head> <br> <telo> <br> <h1> Dobrodošli na spletnem mestu </ h1> <br> <p> To je delovni primer za kodiranje izvorne kode. </ p> <br> </ body> <br> </ html> </p> <p> Prva datoteka je izvirna spletna stran z naslovom "Dobrodošli v MySite". Druga datoteka je enaka kot prva datoteka, razen MyFile se v besedilu preimenuje v YourFile. </p> <h3> Kako ustvariti datoteko Diff </h3><p> Da bi ustvarili obliž, moramo razlikovati med myfile.html in myfile_v2.html. </p> <p> To lahko storimo z ukazom diff na naslednji način: </p> <p> diff -u myfile.html myfile_v2.html> myfile.patch </p> <p> Datoteko myfile.patch lahko v <a href="https://sl.eyewated.com/zacetni-vodnik-za-urejevalnik-nano/">urejevalniku nano</a> odprete tako, da si jo ogledate: </p> <p> nano myfile.patch </p> <p> Vrstice, ki so nespremenjene, so prikazane modro. Vrstice, ki so bile odstranjene, so prikazane rdeče in dodane vrstice so prikazane zeleno. </p> <h3> Kako uporabiti obliž z uporabo ukaza za popravilo </h3><p> Če želite uporabiti obliž na myfile.html, uporabite ta ukaz: </p> <p> patch <myfile.patch </p> <h3> Kako vrniti obliž </h3><p> To bo uporabilo spremembe, ustvarjene z ukazom diff, v izvorno datoteko myfile.html. </p> <p> Če želite popraviti popravek, tako da se myfile.html vrne na način, ki je prvotno uporabil naslednji ukaz: </p> <p> patch -R <myfile.patch </p> <h3> Povzetek </h3><p> Ukaz za popravke lahko uporabite za izvajanje popravkov v celotni strukturi imenikov. </p> <p> Obstaja veliko boljša orodja od ukaza za popravilo za ustvarjanje popravkov in zagotavljanje dobrega nadzora nad izvornimi viri. </p> <p> Obstaja razlog, da toliko razvojnih projektov uporablja GIT za nadzor virov. GIT olajša oblikovanje dosledne strategije razvejanja. </p> <p> Ukaz za popravke je v redu za uporabo razlik v skript bash ali nekaj preprostega, lahko pa preprosto ustvarite varnostno kopijo datotek, ki jih želite popraviti, in preprosto kopirajte nove datoteke na isto mesto. </p> <p> Za več informacij uporabite ukaz man: </p> <p> človek obliž </p> </div> <div class="amp-related-wrapper"> <h2>Alike posts</h2> <div class="amp-related-content"> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/nastavi-ukaz-linux-linux-unix/">Nastavi - ukaz Linux Linux - Unix</a></h3> <div class="amp-related-meta"> Linux </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/vec-o-ukazu-linux-ifconfig/"> <amp-img src="https://exse.eyewated.com/pict/4425f9bd215033c2-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/vec-o-ukazu-linux-ifconfig/">Več o ukazu Linux Ifconfig</a></h3> <div class="amp-related-meta"> Linux </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/inittab-linux-unix-ukaz/"> <amp-img src="https://exse.eyewated.com/pict/b9b0913bff823b2e-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/inittab-linux-unix-ukaz/">Inittab-Linux / Unix ukaz</a></h3> <div class="amp-related-meta"> Linux </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/naucite-se-linux-command-fs-datotecni-sistemi/"> <amp-img src="https://exse.eyewated.com/pict/ecba74809176344b-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/naucite-se-linux-command-fs-datotecni-sistemi/">Naučite se Linux Command-fs-datotečni sistemi</a></h3> <div class="amp-related-meta"> Linux </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-uporabljati-zgornje-ukaze-linux-za-prikazovanje-tekocih-procesov/"> <amp-img src="https://exse.eyewated.com/pict/90e2bfde80833409-120x86.png" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-uporabljati-zgornje-ukaze-linux-za-prikazovanje-tekocih-procesov/">Kako uporabljati zgornje ukaze Linux za prikazovanje tekočih procesov</a></h3> <div class="amp-related-meta"> Linux </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-ustvariti-simbolicne-povezave-z-ukazom-ln/"> <amp-img src="https://exse.eyewated.com/pict/142cb9d99392338e-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-ustvariti-simbolicne-povezave-z-ukazom-ln/">Kako ustvariti simbolične povezave z ukazom ln</a></h3> <div class="amp-related-meta"> Linux </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-zacasno-spremeniti-racune-in-privilegije/"> <amp-img src="https://exse.eyewated.com/pict/d087e2f49d282f7f-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-zacasno-spremeniti-racune-in-privilegije/">Kako začasno spremeniti račune in privilegije</a></h3> <div class="amp-related-meta"> Linux </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-uporabljati-testne-pogoje-znotraj-scenarija-bash/"> <amp-img src="https://exse.eyewated.com/pict/8fe5981fee103581-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-uporabljati-testne-pogoje-znotraj-scenarija-bash/">Kako uporabljati testne pogoje znotraj scenarija Bash</a></h3> <div class="amp-related-meta"> Linux </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/get-linux-ukaz-unix-ukaz/"> <amp-img src="https://exse.eyewated.com/pict/1f35792a5ab44184-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/get-linux-ukaz-unix-ukaz/">GET - Linux ukaz - Unix ukaz</a></h3> <div class="amp-related-meta"> Linux </div> </div> </div> </div> <div class="amp-related-wrapper"> <h2>See Newest</h2> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-poslati-fotografijo-ali-sliko-s-programom-iphone/"> <amp-img src="https://exse.eyewated.com/pict/814e4cbf95a62f3c-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-poslati-fotografijo-ali-sliko-s-programom-iphone/">Kako poslati fotografijo ali sliko s programom iPhone</a></h3> <div class="amp-related-meta"> IPhone in iPod </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-namestiti-servisni-paket-sp2-za-windows-vista-sp2/"> <amp-img src="https://exse.eyewated.com/pict/c78c531a5e5f33f2-120x86.png" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-namestiti-servisni-paket-sp2-za-windows-vista-sp2/">Kako namestiti servisni paket SP2 za Windows Vista (SP2).</a></h3> <div class="amp-related-meta"> Windows </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/patch-my-pc-v4-0-1-5/"> <amp-img src="https://exse.eyewated.com/pict/ae95b17d479f3555-120x86.png" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/patch-my-pc-v4-0-1-5/">Patch My PC v4.0.1.5</a></h3> <div class="amp-related-meta"> Programska oprema in aplikacije </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/olympus-vg-160-pregled/"> <amp-img src="https://exse.eyewated.com/pict/cae9adb9fd4f348b-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/olympus-vg-160-pregled/">Olympus VG-160 Pregled</a></h3> <div class="amp-related-meta"> Ocene izdelkov </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-prenesti-posodobitve-v-operacijskem-sistemu-windows-8-1/"> <amp-img src="https://exse.eyewated.com/pict/ce3a2728589a31bd-120x86.png" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-prenesti-posodobitve-v-operacijskem-sistemu-windows-8-1/">Kako prenesti posodobitve v operacijskem sistemu Windows 8.1</a></h3> <div class="amp-related-meta"> Windows </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/grand-theft-auto-iv-patch-razlicica-1-0-5-0/"> <amp-img src="https://exse.eyewated.com/pict/fe276fd7bd5b2f3b-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/grand-theft-auto-iv-patch-razlicica-1-0-5-0/">Grand Theft Auto IV Patch Različica 1.0.5.0</a></h3> <div class="amp-related-meta"> Igre </div> </div> </div> </div> <div class="amp-related-wrapper"> <h2>Sapid posts</h2> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kaj-je-data-mining/"> <amp-img src="https://exse.eyewated.com/pict/20eeacf1d5063164-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kaj-je-data-mining/">Kaj je Data Mining?</a></h3> <div class="amp-related-meta"> New & Next </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/odpravljanje-tezav-pri-pomnilniskih-karticah-sd/"> <amp-img src="https://exse.eyewated.com/pict/32eebf7cb124396c-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/odpravljanje-tezav-pri-pomnilniskih-karticah-sd/">Odpravljanje težav pri pomnilniških karticah SD</a></h3> <div class="amp-related-meta"> Digitalni fotoaparati </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/tiskalnik-hp-officejet-250-mobile-all-in-one/"> <amp-img src="https://exse.eyewated.com/pict/2fbef4a4ece03254-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/tiskalnik-hp-officejet-250-mobile-all-in-one/">Tiskalnik HP Officejet 250 Mobile All-in-One</a></h3> <div class="amp-related-meta"> Nakup vodniki </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/asus-zenbook-3-power-v-majhnem-paketu/"> <amp-img src="https://exse.eyewated.com/pict/426e3f186b6d3586-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/asus-zenbook-3-power-v-majhnem-paketu/">ASUS ZenBook 3: Power v majhnem paketu</a></h3> <div class="amp-related-meta"> Ocene izdelkov </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/preklopite-command-prompt-in-powershell-v-meniju-win-x/"> <amp-img src="https://exse.eyewated.com/pict/6c241fd359664706-120x86.png" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/preklopite-command-prompt-in-powershell-v-meniju-win-x/">Preklopite Command Prompt in Powershell v meniju Win + x</a></h3> <div class="amp-related-meta"> Windows </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/prednosti-spletne-konference/"> <amp-img src="https://exse.eyewated.com/pict/29c34396c92834d5-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/prednosti-spletne-konference/">Prednosti spletne konference</a></h3> <div class="amp-related-meta"> Splet in iskanje </div> </div> </div> <div class="amp-related-content"> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/8-najboljsih-preklopnikov-hdmi-za-nakup-leta-2018/">8 najboljših preklopnikov HDMI za nakup leta 2018</a></h3> <div class="amp-related-meta"> Nakup vodniki </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kaj-je-metoda-afssi-5020/"> <amp-img src="https://exse.eyewated.com/pict/6f8f782370642f22-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kaj-je-metoda-afssi-5020/">Kaj je metoda AFSSI-5020?</a></h3> <div class="amp-related-meta"> Windows </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-uporabljati-xml-s-css/"> <amp-img src="https://exse.eyewated.com/pict/9c85ee5d99d440a0-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-uporabljati-xml-s-css/">Kako uporabljati XML s CSS</a></h3> <div class="amp-related-meta"> Web Design & Dev </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-uporabljati-zgornje-ukaze-linux-za-prikazovanje-tekocih-procesov/"> <amp-img src="https://exse.eyewated.com/pict/90e2bfde80833409-120x86.png" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-uporabljati-zgornje-ukaze-linux-za-prikazovanje-tekocih-procesov/">Kako uporabljati zgornje ukaze Linux za prikazovanje tekočih procesov</a></h3> <div class="amp-related-meta"> Linux </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-preveriti-mp3-datoteke-za-napake/"> <amp-img src="https://exse.eyewated.com/pict/b5080d525a8d3a1b-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-preveriti-mp3-datoteke-za-napake/">Kako preveriti MP3 datoteke za napake</a></h3> <div class="amp-related-meta"> Splet in iskanje </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/naucite-se-osnove-mifi-mobile-hotspot/"> <amp-img src="https://exse.eyewated.com/pict/fb3ebebaab2f34ea-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/naucite-se-osnove-mifi-mobile-hotspot/">Naučite se Osnove MiFi Mobile Hotspot</a></h3> <div class="amp-related-meta"> Internet in omrežje </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/disk-utility-lahko-ustvari-jbod-raid-set-za-vas-mac/"> <amp-img src="https://exse.eyewated.com/pict/a5f173bdf40f3107-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/disk-utility-lahko-ustvari-jbod-raid-set-za-vas-mac/">Disk Utility lahko ustvari JBOD RAID Set za vaš Mac</a></h3> <div class="amp-related-meta"> Macs </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/kako-izvleci-avdio-mp3-iz-video-datotek/"> <amp-img src="https://exse.eyewated.com/pict/01c919597aa83431-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/kako-izvleci-avdio-mp3-iz-video-datotek/">Kako izvleči avdio (MP3) iz video datotek</a></h3> <div class="amp-related-meta"> Programska oprema in aplikacije </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/brezplacno-salesforce-com-socialne-aplikacije-za-mala-podjetja/"> <amp-img src="https://exse.eyewated.com/pict/d785bb6b81473265-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/brezplacno-salesforce-com-socialne-aplikacije-za-mala-podjetja/">Brezplačno Salesforce.com Socialne aplikacije za mala podjetja</a></h3> <div class="amp-related-meta"> Programska oprema in aplikacije </div> </div> </div> <div class="amp-related-content"> <a href="https://sl.eyewated.com/windows-10-continuum-vklopite-telefon-v-racunalnik/"> <amp-img src="https://exse.eyewated.com/pict/11f24306731833bf-120x86.jpg" width="120" height="86" layout="responsive" class="amp-related-image"></amp-img> </a> <div class="amp-related-text"> <h3><a href="https://sl.eyewated.com/windows-10-continuum-vklopite-telefon-v-racunalnik/">Windows 10 Continuum: Vklopite telefon v računalnik</a></h3> <div class="amp-related-meta"> Programska oprema in aplikacije </div> </div> </div> </div></article> <footer class="amp-wp-footer"> <div class="amp-wp-footer-inner"> <a href="#" class="back-to-top">Back to top</a> <p class="copyright"> © 2024 sl.eyewated.com </p> <div class="amp-wp-social-footer"> <a href="#" class="jeg_facebook"><i class="fa fa-facebook"></i> </a><a href="#" class="jeg_twitter"><i class="fa fa-twitter"></i> </a><a href="#" class="jeg_google-plus"><i class="fa fa-google-plus"></i> </a><a href="#" class="jeg_pinterest"><i class="fa fa-pinterest"></i> </a><a href="" class="jeg_rss"><i class="fa fa-rss"></i> </a> </div> </div> </footer> <div id="statcounter"> <amp-pixel src="https://c.statcounter.com/12022999/0/02d06b5d/1/"> </amp-pixel> </div> </body> </html>