* Torfinn Ingolfsen ([email protected]) wrote: > Another question: how do I create a diff that removes one of the files > in amule2/files? > I tried > diff -u amule2.org/files/patch-amuleDlg.cpp /dev/null >> amule2.diff > > And the diff looks ok: > --- amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 > +++ /dev/null 2008-12-29 23:22:00.000000000 +0100
Obviously this way diff will have no idea on what file to delete, as amule2.org/files/patch-amuleDlg.cpp path does not exist. This way it should work: --- amule2/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 +++ /dev/null 2008-12-29 23:22:00.000000000 +0100 or this way: --- amule2.orig/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 +++ amule2/files/patch-amuleDlg.cpp 2008-12-29 23:22:00.000000000 +0100 (only '-' lines follow, `patch` will remove resulting empty file) But I assume what you need is -r option for diff - it compares 2 directories recursively, processing all changes as well as new and removed files correctly. % diff -ruN /usr/ports/net-p2p/amule amule where amule is your modified port. -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D [email protected] ..: jabber: [email protected] http://www.amdmi3.ru _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "[email protected]"
