[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Compare "main" trunk against all branches

From: Todd Denniston
Subject: Re: Compare "main" trunk against all branches
Date: Fri, 07 Nov 2008 11:50:27 -0500
User-agent: Thunderbird (X11/20080914)

gc wrote, On 11/07/2008 10:50 AM:
On Nov 7, 10:36 am, Todd Denniston <address@hidden>

Thanks I'll try "cvs diff -N -u -rHEAD"
but for "diff -N -u -r proj_branchA/ proj_head/", the -N and -u
options don't exist for diff in my brand of Unix (Solaris 8).

What! you don't have a sane admin? :)

just gnu it (install a real diff for your self, from source if you have to :).

you might see if the admin installed the gnu packages from solaris, which IIRC install things like gcc, gmake & gdiff, i.e., replace diff with gdiff.

also try `locate diff`, the gnu diff may be on the machine but not in your path.

alternatively using the sun diff:
diff -r proj_branchA/ proj_head/
will let you know if there are any files in both that have differences, but to find the "new files" you would need to do:
find proj_branchA/ -type f > proj_branchA.listing
find proj_head/ -type f > proj_head.listing
diff proj_branchA.listing proj_head.listing

Of course the above assumes you truly do have an admin with questionable sanity/legal requirements, which prevents the admin from being convinced to install a useful tool.

Todd Denniston
Crane Division, Naval Surface Warfare Center (NSWC Crane)
Harnessing the Power of Technology for the Warfighter

reply via email to

[Prev in Thread] Current Thread [Next in Thread]