Re: moving files from a branch to the Main trunk-clarification

[Mike Castle]

On Wed, Jul 11, 2001 at 01:00:46PM -0700, Ketan Shah wrote:
> Clarification from my earlier post.
> I do NOT want to merge my changes.
> I just want the branched file on the main trunk.

In a separate area:
cvs export -r branch

In the sandbox:
cvs up -A
find . -name CVS -prune -o -type f -print | xargs rm

copy over exported stuff.....

cvs -n up | awk '/^U/ {print $2}' | xargs -r cvs rm
cvs -n up | awk '/^\?/ {print $2}' | xargs -r cvs add

verify everything is as it should be....  example.. the above would miss
new directories....

cvs commit -m "replaced main branch with branch foo"

-- 
     Mike Castle      address@hidden      www.netcom.com/~dalgoda/
    We are all of us living in the shadow of Manhattan.  -- Watchmen
fatal ("You are in a maze of twisty compiler features, all different"); -- gcc