diff and patch using wrong line ending when creating new files or line end changed -



diff and patch using wrong line ending when creating new files or line end changed -

i'm trying create patch using diff, can't patch utilize line end characters used in files when creating new file or alter line ending when file changes it. basically, i'm doing:

cp -r dir1 dir3 diff -run dir1 dir2 > dir3\patch.txt cd dir3 patch -p1 < patch.txt

all changes between dir1 , dir2 apply, except end of line character new files defaulting cr+lf, file in dir2 uses lf end of line marker. also, files difference between them line end alter not patched in way -- diff doesn't seem see change.

so running diff -rq dir2 dir3 gives bunch of files aaa , bbb differ, diff -rwq dir2 dir3 works fine.

i'm using diff - gnu diffutils version 2.7 , patch 2.5 unxutils on windows xp.

is there way create new , changed files included in patch maintain line ending original file?

this works:

cp -r dir1 dir3 diff --binary -run dir1 dir2 > dir3\patch.txt cd dir3 patch --no-backup-if-mismatch --binary -u -p1 < patch.txt

not using --binary flag means file parsed line line, ignoring eol. reason, won't patch cleanly (gives hunk #1 succeeded @ 1 fuzz 1. message) had include --no-backup-if-mismatch prevent making .orig files. -u seems optional, since patch figure patch type out on it's own.

diff patch newline eol lf

Comments

Post a Comment

Popular posts from this blog

iphone - Dismissing a UIAlertView -

iphone - Dismissing a UIAlertView - i set in app purchase app, , when user taps button, purchase started. basically, tap button, , depending on speed on net connection, waiting 10 seconds until new alert view comes asking if purchase product. user tap button multiple times since nil came up, , multiple purchase alert views come up. additionally, maybe seen user app bug. in end, problem. i want alert view come spinning wheel says "loading..." when users taps purchase button. problem is, how dismiss when new alert view comes asking user if want purchase product? if ([uialertview alloc] says: @"whatever apple's alert view says") { //dismiss "loading..." alert view here } i uncertainty work, input appreciated. thanks! you need have access alertview. can this. create alertview instance var in app delegate , when want show loading initialize instance var assign property , when want dismiss phone call [alertviewinstance d...
Read more

c# - Can ProtoBuf-Net deserialize to a flat class? -

c# - Can ProtoBuf-Net deserialize to a flat class? - protobuf-net uses nested protobuf constructs back upwards inheritance. however, can made force properties flat target class has same properties inherited "serialized" version? see test illustration below. needless result of flat namespace null both properties. possible solution: re-create info flat.b first on property property basis. note: not prefered option. using system; namespace hierarchy { using protobuf; [protocontract] public class { [protomember(1)] public string prop1 { get; set; } } [protocontract] public class b : { public b() { } [protomember(1)] public string prop2 { get; set; } public override string tostring() { homecoming "prop1=" + prop1 + ", prop2=" + prop2; } } } namespace flat { using protobuf; [protocontract] p...
Read more

javascript - Change element in each JQuery tab to dynamically generated colors -

javascript - Change element in each JQuery tab to dynamically generated colors - i'm using jquery ui tabs widget , have button add together additional tabs. i'm tying each tab markers on map coordinating randomly generated color using function gen_color() { homecoming '#'+(math.random()*0xffffff<<0).tostring(16); } so each tab has color corresponds number of markers of same color on map. i'm trying add together 15x15 block of color within tab's tab left of it's label. right i'm using tabtemplate alternative , trying alter when new tab added: $tabs = $("#tabs").tabs({ tabtemplate: "<li><span class='ui-icon-color' style='background-color:#000000;'></span><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close'>remove tab</span></li>", selected: 0, add: funct...
Read more