On Monday 05 March 2007 19:40, guy keren wrote: > On Mon, 5 Mar 2007, Tzahi Fadida wrote: > > Date: Mon, 5 Mar 2007 16:03:49 +0200 > > From: Tzahi Fadida <[EMAIL PROTECTED]> > > To: Alexander Indenbaum <[EMAIL PROTECTED]> > > Cc: Israel Linux Mailing list <[email protected]> > > Subject: Re: Visual diff tool for patches. > > > > On Monday 05 March 2007 14:33, Alexander Indenbaum wrote: > > > 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. > > > > > > Then fire up meld (or any other merge tool) and just apply/move > > > changes one by one from "modified" to "pristine". > > > > > > Hope it helps. > > > > That is a good idea and i am going to use it, however, it is very tiring > > to do so for each patch i receive. There got to be a better way, even > > from the console but interactive so i can approve or disapprove of a > > certain part. I mean, how do kernel developers work with this. You cannot > > cut/paste all the time with manymany patches instead of clicking like in > > kdiff and friends. There got to be a better arrangement. > > who said anything about copy and paste? all you do is: > > cp -rp original/ modified > apply patch to modified. > run the diff tool (meld, tkdiff, whatever) between original and modified.
That is a good idea, however, i only wish to automate this for the patched files (since i don't want to copy 20mb of files just for the few patched files). How can i only copy the files to be patched, let's say to /tmp and then run the patch on them. > you can write a short script to automate these operations (except the > usage of the diff tool, ofcourse). look at this: > > http://xxdiff.sourceforge.net/local/doc/xxdiff-patch-UNFINISHED.html Looks interesting, buggy though. If i won't find anything working, perhaps i will try to change this to use kdiff3 or meld. > > --guy > > > > On 3/5/07, Tzahi Fadida <[EMAIL PROTECTED]> wrote: > > > > On Monday 05 March 2007 14:06, Alexander Indenbaum wrote: > > > > > Meld : Diff and merge tool > > > > > http://meld.sourceforge.net/ > > > > > > > > As i wrote below, meld does not seem to support patch files. > > > > If you know otherwise, please tell me how to do it. > > > > > > > > > On 3/5/07, Tzahi Fadida <[EMAIL PROTECTED]> wrote: > > > > > > Hi, > > > > > > I was given a patch (that refers to several files in a directory) > > > > > > and i wish to review and merge the changes one at a time > > > > > > visually. I tried xfdiff which allows me to review the changes > > > > > > but it have a bug when i am trying to apply them one by one. > > > > > > I tried kcompare, but it tries to do something weird. It tries to > > > > > > revert the patch file to my original files into new files, which > > > > > > is weird enough, but also when i try to save it says it can't > > > > > > upload the file to destination folder etc.. In this instance i > > > > > > tried source:patch destination:folder. If i reverse the roles i > > > > > > get something weird: Error - the files are identical. kdiff3 and > > > > > > meld does not seem to support patch files at all. > > > > > > > > > > > > Can anyone suggest a proper tool? > > > > > > > > > > > > -- > > > > > > Regards, > > > > > > Tzahi. > > > > > > -- > > > > > > Tzahi Fadida > > > > > > Blog: http://tzahi.blogsite.org | Home Site: > > > > > > http://tzahi.webhop.info WARNING TO SPAMMERS: see at > > > > > > http://members.lycos.co.uk/my2nis/spamwarning.html > > > > > > > > > > > > To unsubscribe, send mail to [EMAIL PROTECTED] with > > > > > > the word "unsubscribe" in the message body, e.g., run the command > > > > > > echo unsubscribe | [EMAIL PROTECTED] > > > > > > > > -- > > > > Regards, > > > > Tzahi. > > > > -- > > > > Tzahi Fadida > > > > Blog: http://tzahi.blogsite.org | Home Site: http://tzahi.webhop.info > > > > WARNING TO SPAMMERS: see at > > > > http://members.lycos.co.uk/my2nis/spamwarning.html > > > > -- > > Regards, > > Tzahi. > > -- > > Tzahi Fadida > > Blog: http://tzahi.blogsite.org | Home Site: http://tzahi.webhop.info > > WARNING TO SPAMMERS: see at > > http://members.lycos.co.uk/my2nis/spamwarning.html > > > > ================================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] -- Regards, Tzahi. -- Tzahi Fadida Blog: http://tzahi.blogsite.org | Home Site: http://tzahi.webhop.info WARNING TO SPAMMERS: see at http://members.lycos.co.uk/my2nis/spamwarning.html ================================================================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]
