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 many many patches instead of clicking like in kdiff and friends. There got to be a better arrangement. > > 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 | 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 -- 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]
