[Top][All Lists]

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

Re: Compare "main" trunk against all branches

From: gc
Subject: Re: Compare "main" trunk against all branches
Date: Fri, 7 Nov 2008 07:50:58 -0800 (PST)
User-agent: G2/1.0

On Nov 7, 10:36 am, Todd Denniston <address@hidden>
> gc wrote, On 10/31/2008 01:14 PM:
> > I want to only use the "main"trunkin the future. Before doing this,
> > I need to confirm that all changes committed on any one of the current
> > branches, have also been committed to the "main"trunk. What command
> > would do this for me?
> > Thanks,
> > gc
> I think the following MAY work:
> in a branch checkout issue
> cvs diff -N -u -rHEAD
> The following will work but is outside of CVS and requires a bit of disk 
> space:
> cvs checkout -rbranchAtag -d proj_branchA projModule
> cvs checkout -d proj_head projModule
> diff -N -u -r proj_branchA/ proj_head/
> replace branchAtag proj_branchA proj_head projModule as appropriate.
> --
> Todd Denniston
> Crane Division, Naval Surface Warfare Center (NSWC Crane)
> Harnessing the Power of Technology for the Warfighter

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).

reply via email to

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