RE: Joining new files from branch does not work

[Christopher.Fouts]

Try cvs up -Ad to include the new dirs...

-chris

>-----Original Message-----
>From: address@hidden 
>[mailto:address@hidden
>] On Behalf Of Hans-Joachim Matheus
>Sent: Tuesday, December 21, 2004 7:53 AM
>To: 'address@hidden'
>Subject: Joining new files from branch does not work
>
>
>Hello,
>
>I added some new files on a branch
>and try to join them on the main trunk
>but nothing at all happens (cvs 1.10.7)
>
>What I did:
>==============================================
>~ > cvs checkout myproject
>~ > cd myproject
>~/myproject > cvs tag -b branchtest
>~/myproject > cvs up -r branchtest
>~/myproject > mkdir blub
>~/myproject > cvs add blub
>Directory /opt/cvsroot/myproject/blub added to the repository
>--> Using per-directory sticky tag `branchtest'
>~/myproject  > cvs ci -m"test" blub
>cvs commit: Examining blub
>~/myproject > cd blub/
>~/myproject/blub > touch a.txt
>~/myproject/blub > cvs add a.txt 
>cvs server: scheduling file `a.txt' for addition on branch 
>`branchtest' cvs server: use 'cvs commit' to add this file 
>permanently ~/myproject/blub >  cvs ci -m"test" a.txt 
>RCS file: /opt/cvsroot/myproject/blub/Attic/a.txt,v
>done
>Checking in a.txt;
>/opt/cvsroot/myproject/blub/Attic/a.txt,v  <--  a.txt
>new revision: 1.1.2.1; previous revision: 1.1
>done
>~/myproject/blub > cd ..
>~/myproject > cvs up -A
>[...]
>~/myproject > cvs up -j branchtest
>[...]
>~/myproject > ls -l blub
>ls: blub: File or directory not found.
>~/myproject > 
>================================================
>
>cvs manual tells me a different story. Any help?
>
>Jochen
>
>
>
>_______________________________________________
>Info-cvs mailing list
>address@hidden
>http://lists.gnu.org/mailman/listinfo/info-cvs
>