ahojte chcel by som rozpehnut patch pre network simulator verziu 2.33 ale on je urceny pre 2.27 tak zatial som dal len replace na 2.33 z 2.27 v tom patchy co vsetko tam mam zmenit bo medzi jednotlivymi verziami simulatorov niesu az take velke zmeny...
ked spustim path tak mi vyhadzuje chybu na .rej supebore neviete co to mozze znamenaat?
Patch attempted to create file ns-2.33/sip/sip-messages.cc, which already exists.
1 out of 1 hunk FAILED -- saving rejects to file ns-2.33/sip/sip-messages.cc.rej
The next patch would create the file ns-2.33/sip/sip-messages.h,
which already exists! Assume -R? [n] n
Apply anyway? [n] n
1 out of 1 hunk ignored -- saving rejects to file ns-2.33/sip/sip-messages.h.rej
The next patch would create the file ns-2.33/sip/sip-proxy.cc,
which already exists! Assume -R? [n] n
Apply anyway? [n] n
1 out of 1 hunk ignored -- saving rejects to file ns-2.33/sip/sip-proxy.cc.rej
diik moc
problem s patchom
Pre pridávanie komentárov sa musíte prihlásiť.
$ patch -s -p1 < ns-allinone-2.27-sip-v1_11.patch --verbose
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ns-allinone-2.33-orig/ns-2.33/tcl/lib/ns-lib.tcl 2004-01-13 00:54:42.000000000 +0000
|+++ ns-allinone-2.33-mysip/ns-2.33/tcl/lib/ns-lib.tcl 2006-06-27 16:50:08.193462424 +0100
--------------------------
Patching file ns-2.33/tcl/lib/ns-lib.tcl using Plan A...
Hunk #1 succeeded at 254 with fuzz 2 (offset 27 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ns-allinone-2.33-orig/ns-2.33/tcl/lib/ns-sip.tcl 1970-01-01 01:00:00.000000000 +0100
|+++ ns-allinone-2.33-mysip/ns-2.33/tcl/lib/ns-sip.tcl 2006-06-27 16:55:20.815624125 +0100
--------------------------
Patching file ns-2.33/tcl/lib/ns-sip.tcl using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ns-allinone-2.33-orig/ns-2.33/adc/adc.h 2004-01-13 00:57:29.000000000 +0000
|+++ ns-allinone-2.33-mysip/ns-2.33/adc/adc.h 2004-12-14 12:30:46.000000000 +0000
--------------------------
Patching file ns-2.33/adc/adc.h using Plan A...
Hunk #1 succeeded at 59 (offset 22 lines).
tak zjavne musim v patchy zmenit tie chybove riadky...
Ak ti to neprejde - co je casto kvoli tomu, ze patchujes voci nespravnej verzii suboru - tak si mozes zmeny sam rucne aplikovat.
--- znamena co treba zo stareho suboru vymazat
+++ znamena, co treba namiesto vymazaneho textu doplnit
- miesta zmien su v patch subore ocislovane a uvedene v sirsom kontexte, aby sa nestalo, ze pri rovnakom vyskyte urciteho textu zmeni patchovaci program hned prvy takyto text, na ktory narazi
- a vysledok bude nespravny.
cize, otvor si v editore patch a patchovany subor, v patchi si najdi cisla riadkov a vhodne klucove slova pomocou, ktorych sa budes orientovat v patchovanom subore.
mozem ti este pomoct predstavou, ze patch (s diffom) je vlastne "sledovanie zmien dokumentu" a "zlucenie dokumentov" v MS Word - ak taky program poznas
The next patch would create the file dir/file which already exists
dik za pomoc
Ale aj tak je to pomerne vyčerpávajúce, nezávidím ti to :)