Petter Reinholdtsen wrote:
> [Christoph Toshok]
> > well... COPYING.LIB was already added on my branch, so I can go
> > ahead and move it to the head... :) Just need to make sure they show
> > up in the Makefile.am's (either as a SOURCE or EXTRA_DIST.) other
> > than that, just "cvs add <filename>" and "cvs commit -m 'added'
> > <filename>'".
>
> I need to move it from JDK_12_BRANCH to head, not add it for the first
> time. I'm not allowed to add a file already in a branch.
yay, cvs merge stuff :)
I did it -- the command lines I used were:
cvs co -A hungry/java/japhar
[... wait... :) ]
cd hungry/java/japhar
cvs up -j JDK_12_BRANCH COPYING.LIB
cvs commit -m "....." COPYING.LIB
xtoph
