[EMAIL PROTECTED]:~/tmp$ echo "test 123" > 1.txt [EMAIL PROTECTED]:~/tmp$ cp -la 1.txt 2.txt [EMAIL PROTECTED]:~/tmp$ echo "test 321" > 1.txt [EMAIL PROTECTED]:~/tmp$ diff 1.txt 2.txt [EMAIL PROTECTED]:~/tmp$
[EMAIL PROTECTED]:~/tmp$ echo "test 123" > 1.txt [EMAIL PROTECTED]:~/tmp$ cp -la 1.txt 2.txt [EMAIL PROTECTED]:~/tmp$ echo "test 1234" > 2.txt [EMAIL PROTECTED]:~/tmp$ diff 1.txt 2.txt [EMAIL PROTECTED]:~/tmp$ mmmm.... I don't think this will work ;-) ביום שלישי 06 מרץ 2007, 09:28, נכתב על ידי Vassilii Khachaturov: > > Did not see you mentioned meld specifically. Anyway I could sugest the > > following procedure. > > > > You could prepare two copies of the source tree: "pristine" and > > "modified", where "modified" is "pristine" with patch applied. > > Very true. It's also a good idea to do the copy with the > cp -la > option so that the files are not copied, but linked instead, > so the only thing you waste the disk for is the inodes and > the files that actually differ. > > > Then fire up meld (or any other merge tool) and just apply/move > > changes one by one from "modified" to "pristine". > > ================================================================= > To unsubscribe, send mail to [EMAIL PROTECTED] with > the word "unsubscribe" in the message body, e.g., run the command > echo unsubscribe | mail [EMAIL PROTECTED] ================================================================= To unsubscribe, send mail to [EMAIL PROTECTED] with the word "unsubscribe" in the message body, e.g., run the command echo unsubscribe | mail [EMAIL PROTECTED]
