diff文件夹比较与关键字过滤

比较文件夹记得加上-r, 这样才可以递归所有文件夹，-q可以只输出哪些文件是不一样的，对于比较文件夹，可能这个比较有用。不过-q输出不同的文件时，有些情况是一个文件一个文件夹下有，一个没有，但是-q输出的是2个文件不一样
diff -Nrq a b

过滤”.svn”文件夹
diff -x “.svn” -Nrq totempure/src/ postgresql-8.1.2/src/ > diff.out
比较后输出如下

Files totempure/src/backend/access/common/heaptuple.c and postgresql-8.1.2/src/backend/access/common/heaptuple.c differ
Files totempure/src/backend/access/common/tupdesc.c and postgresql-8.1.2/src/backend/access/common/tupdesc.c differ
Files totempure/src/backend/access/heap/bipointer.c and postgresql-8.1.2/src/backend/access/heap/bipointer.c differ
Files totempure/src/backend/access/heap/heapam.c and postgresql-8.1.2/src/backend/access/heap/heapam.c differ
Files totempure/src/backend/access/heap/Makefile and postgresql-8.1.2/src/backend/access/heap/Makefile differ
Files totempure/src/backend/access/heap/propagation.c and postgresql-8.1.2/src/backend/access/heap/propagation.c differ
Files totempure/src/backend/access/heap/protree.c and postgresql-8.1.2/src/backend/access/heap/protree.c differ
Files totempure/src/backend/access/heap/soudepset.c and postgresql-8.1.2/src/backend/access/heap/soudepset.c differ
Files totempure/src/backend/access/index/indexam.c and postgresql-8.1.2/src/backend/access/index/indexam.c differ
Files totempure/src/backend/access/nbtree/nbtree.c and postgresql-8.1.2/src/backend/access/nbtree/nbtree.c differ
Files totempure/src/backend/access/transam/varsup.c and postgresql-8.1.2/src/backend/access/transam/varsup.c differ
Files totempure/src/backend/access/transam/xlog.c and postgresql-8.1.2/src/backend/access/transam/xlog.c differ
Files totempure/src/backend/bootstrap/bootscanner.c and postgresql-8.1.2/src/backend/bootstrap/bootscanner.c differ
Files totempure/src/backend/bootstrap/.cvsignore and postgresql-8.1.2/src/backend/bootstrap/.cvsignore differ
Files totempure/src/backend/catalog/dependency.c and postgresql-8.1.2/src/backend/catalog/dependency.c differ
Files totempure/src/backend/catalog/genbki.sh and postgresql-8.1.2/src/backend/catalog/genbki.sh differ
Files totempure/src/backend/catalog/heap.c and postgresql-8.1.2/src/backend/catalog/heap.c differ
Files totempure/src/backend/catalog/index.c and postgresql-8.1.2/src/backend/catalog/index.c differ
Files totempure/src/backend/catalog/Makefile and postgresql-8.1.2/src/backend/catalog/Makefile differ
Files totempure/src/backend/catalog/pg_aggregate.c and postgresql-8.1.2/src/backend/catalog/pg_aggregate.c differ
Files totempure/src/backend/catalog/pg_proc.c and postgresql-8.1.2/src/backend/catalog/pg_proc.c differ
Files totempure/src/backend/commands/alter.c and postgresql-8.1.2/src/backend/commands/alter.c differ
Files totempure/src/backend/commands/analyze.c and postgresql-8.1.2/src/backend/commands/analyze.c differ
Files totempure/src/backend/commands/classcmds.c and postgresql-8.1.2/src/backend/commands/classcmds.c differ
Files totempure/src/backend/commands/comment.c and postgresql-8.1.2/src/backend/commands/comment.c differ
Files totempure/src/backend/commands/copy.c and postgresql-8.1.2/src/backend/commands/copy.c differ
Files totempure/src/backend/commands/explain.c and postgresql-8.1.2/src/backend/commands/explain.c differ
Files totempure/src/backend/commands/functioncmds.c and postgresql-8.1.2/src/backend/commands/functioncmds.c differ
Files totempure/src/backend/commands/indexcmds.c and postgresql-8.1.2/src/backend/commands/indexcmds.c differ
Files totempure/src/backend/commands/lockcmds.c and postgresql-8.1.2/src/backend/commands/lockcmds.c differ
Files totempure/src/backend/commands/Makefile and postgresql-8.1.2/src/backend/commands/Makefile differ
Files totempure/src/backend/commands/proclang.c and postgresql-8.1.2/src/backend/commands/proclang.c differ
Files totempure/src/backend/commands/tablecmds.c and postgresql-8.1.2/src/backend/commands/tablecmds.c differ
Files totempure/src/backend/commands/trigger.c and postgresql-8.1.2/src/backend/commands/trigger.c differ
Files totempure/src/backend/commands/typecmds.c and postgresql-8.1.2/src/backend/commands/typecmds.c differ
Files totempure/src/backend/commands/vacuum.c and postgresql-8.1.2/src/backend/commands/vacuum.c differ
Files totempure/src/backend/commands/vacuumlazy.c and postgresql-8.1.2/src/backend/commands/vacuumlazy.c differ
Files totempure/src/backend/executor/execAmi.c and postgresql-8.1.2/src/backend/executor/execAmi.c differ
Files totempure/src/backend/executor/execMain.c and postgresql-8.1.2/src/backend/executor/execMain.c differ
Files totempure/src/backend/executor/execProcnode.c and postgresql-8.1.2/src/backend/executor/execProcnode.c differ
Files totempure/src/backend/executor/execQual.c and postgresql-8.1.2/src/backend/executor/execQual.c differ
Files totempure/src/backend/executor/execScan.c and postgresql-8.1.2/src/backend/executor/execScan.c differ
Files totempure/src/backend/executor/execTuples.c and postgresql-8.1.2/src/backend/executor/execTuples.c differ
Files totempure/src/backend/executor/execUtils.c and postgresql-8.1.2/src/backend/executor/execUtils.c differ
Files totempure/src/backend/executor/Makefile and postgresql-8.1.2/src/backend/executor/Makefile differ
Files totempure/src/backend/executor/nodeAgg.c and postgresql-8.1.2/src/backend/executor/nodeAgg.c differ
Files totempure/src/backend/executor/nodeAppend.c and postgresql-8.1.2/src/backend/executor/nodeAppend.c differ
Files totempure/src/backend/executor/nodeBitmapHeapscan.c and postgresql-8.1.2/src/backend/executor/nodeBitmapHeapscan.c differ
Files totempure/src/backend/executor/nodeBitmapIndexscan.c and postgresql-8.1.2/src/backend/executor/nodeBitmapIndexscan.c differ
Files totempure/src/backend/executor/nodeDeputyscan.c and postgresql-8.1.2/src/backend/executor/nodeDeputyscan.c differ
Files totempure/src/backend/executor/nodeGroup.c and postgresql-8.1.2/src/backend/executor/nodeGroup.c differ
Files totempure/src/backend/executor/nodeHash.c and postgresql-8.1.2/src/backend/executor/nodeHash.c differ
Files totempure/src/backend/executor/nodeHashjoin.c and postgresql-8.1.2/src/backend/executor/nodeHashjoin.c differ
Files totempure/src/backend/executor/nodeIndexscan.c and postgresql-8.1.2/src/backend/executor/nodeIndexscan.c differ
Files totempure/src/backend/executor/nodeLimit.c and postgresql-8.1.2/src/backend/executor/nodeLimit.c differ
Files totempure/src/backend/executor/nodeMaterial.c and postgresql-8.1.2/src/backend/executor/nodeMaterial.c differ
Files totempure/src/backend/executor/nodeMergejoin.c and postgresql-8.1.2/src/backend/executor/nodeMergejoin.c differ
Files totempure/src/backend/executor/nodeNestloop.c and postgresql-8.1.2/src/backend/executor/nodeNestloop.c differ
Files totempure/src/backend/executor/nodeResult.c and postgresql-8.1.2/src/backend/executor/nodeResult.c differ
Files totempure/src/backend/executor/nodeSeqscan.c and postgresql-8.1.2/src/backend/executor/nodeSeqscan.c differ
Files totempure/src/backend/executor/nodeSetOp.c and postgresql-8.1.2/src/backend/executor/nodeSetOp.c differ
Files totempure/src/backend/executor/nodeSort.c and postgresql-8.1.2/src/backend/executor/nodeSort.c differ
Files totempure/src/backend/executor/nodeSubqueryscan.c and postgresql-8.1.2/src/backend/executor/nodeSubqueryscan.c differ
Files totempure/src/backend/executor/nodeTidscan.c and postgresql-8.1.2/src/backend/executor/nodeTidscan.c differ
Files totempure/src/backend/executor/nodeUnique.c and postgresql-8.1.2/src/backend/executor/nodeUnique.c differ
Files totempure/src/backend/executor/spi.c and postgresql-8.1.2/src/backend/executor/spi.c differ
Files totempure/src/backend/lib/stringinfo.c and postgresql-8.1.2/src/backend/lib/stringinfo.c differ
Files totempure/src/backend/libpq/pg_hba.conf.sample and postgresql-8.1.2/src/backend/libpq/pg_hba.conf.sample differ
Files totempure/src/backend/libpq/pg_ident.conf.sample and postgresql-8.1.2/src/backend/libpq/pg_ident.conf