02-05-2009
Simulate SVN diff using plain diff
Hi,
svn diff does not work very well with 2 local folders, so I am trying to do this diff using diff locally.
since there's a bunch of meta files in an svn directory, I want to do a diff that excludes everything EXCEPT *.java files. there seems to be only an --exclude option, so I'm not sure how to do this.
perhaps, we can use find and execute diff on each .java
or
we can do a grep after we get our result (filter to only .java diffs), but that'd be tricky.
this is what I have so far.
diff -r --exclude=.svn dir1/ dir2/ > diffs.txt
there are simply too many types of files to filter using only the --exclude option.
anyone have thoughts?
10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
Hello,
I want to compare two files. All records in file 2 that are not in file 1 should be output to file 3.
For example:
file 1
123
1234
123456
file 2
123
2345
23456
file 3 should have
2345
23456
I have looked at diff, bdiff, cmp, comm, diff3 without any luck! (2 Replies)
Discussion started by: blt123
2 Replies
2. Shell Programming and Scripting
Hello,
Pls explain the difference between $# and $@, and how its used in shell scripting .
Thanks in advance (4 Replies)
Discussion started by: PradeepRed
4 Replies
3. UNIX for Dummies Questions & Answers
hi all,
i want to do this shell script.
create a script that will check the transferred file vs. orig file.
1. diff the file1 and file2
2. if difference found, retain the original file and email to netcracker team.
3. if no difference found, delete the previous file and retain... (3 Replies)
Discussion started by: tungaw2004
3 Replies
4. UNIX and Linux Applications
I'm on ubuntu fiesty using svn as version control and gvim as my IDE.
i like to review changes to files before checking them in. at some point in my life i used
" svn diff {path}/{filename} "
this now returns
Index: {path}/{file}... (5 Replies)
Discussion started by: manic
5 Replies
5. UNIX for Dummies Questions & Answers
is there any way to make the diff function compare 1 folder to another instead of just file to file?
also, can binary files be compared? (2 Replies)
Discussion started by: puzzler
2 Replies
6. Shell Programming and Scripting
OS : SuSE Linux 10 (zOS)
I create two files test1 and test2
/home/me # more test1
1 2 3 4 5
/home/me # more test2
1 2 3
I entered the following command on cronjob and its work
diff /home/me/test1 /home/me/test2 > /home/me/test3
its created test3.
But the output of test3 is as... (1 Reply)
Discussion started by: sdhn1900
1 Replies
7. UNIX for Dummies Questions & Answers
Hi,
Can anyone tell me the diff between the two filters "more" and "less"?
Many thanks.
Regards,
Venkat. (4 Replies)
Discussion started by: venkatesht
4 Replies
8. Shell Programming and Scripting
Moderator, please, delete this topic (1 Reply)
Discussion started by: optik77
1 Replies
9. Shell Programming and Scripting
Hi,
I am new to shell scripting.
please help me to find out the solution.
I need a script where we need to read the text file(consists of all file names) and get the file names one by one
and append the date suffix for each file name as 'yyyymmdd' .
Then search each file if exists... (1 Reply)
Discussion started by: Lucky123
1 Replies
10. Shell Programming and Scripting
Guys i have 3 files,
but i want to compare and diff only the 2nd column
path=`/home/whois/doms`
for i in `cat domain.tx`
do
whois $i| sed -n '/Registry Registrant ID:/,/Registrant Email:/p' > $path/$i.registrant
whois $i| sed -n '/Registry Admin ID:/,/Admin Email:/p' > $path/$i.admin... (10 Replies)
Discussion started by: kenshinhimura
10 Replies
LEARN ABOUT DEBIAN
config::model::models::debian::dpkg::source::options
Config::Model::models::Debian::Dpkg::Source::Options(3pmUser Contributed Perl DocumentatiConfig::Model::models::Debian::Dpkg::Source::Options(3pm)
NAME
Config::Model::models::Debian::Dpkg::Source::Options - Configuration class Debian::Dpkg::Source::Options
VERSION
version 2.021
DESCRIPTION
Configuration classes used by Config::Model
list of long options that should be automatically prepended to the set of command line options of a dpkg-source -b or dpkg-source
--print-format call. Options like --compression and --compression-level are well suited for this file.
Elements
diff-ignore - perl regexp to filter out files for the diff
perl regular expression to match files you want filtered out of the list of files for the diff.This is very helpful in cutting out
extraneous files that get included in the diff, e.g. if you maintain your source in a revision control system and want to use a checkout to
build a source package without including the additional files and directories that it will usually contain (e.g. CVS, .cvsignore, .svn/).
The default regexp is already very exhaustive, but if you need to replace it, please note that by default it can match any part of a path,
so if you want to match the begin of a filename or only full filenames, you will need to provide the necessary anchors (e.g. '(^|/)',
'($|/)') yourself.Optional. Type uniline.
extend-diff-ignore - Perl regexp to extend the diff-ignore setup
The perl regular expression specified will extend the default regular expression associated to diff-ignore by concatenating "|regexp" to
the default regexp. This option is convenient to exclude some auto-generated files from the automatic patch generation.Optional. Type
uniline.
SEE ALSO
o cme
AUTHOR
Dominique Dumont <domi.dumont@free.fr>
LICENSE
LGPL-2.1
perl v5.14.2 2012-11-09 Config::Model::models::Debian::Dpkg::Source::Options(3pm)