[Top][All Lists]

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

Joining new files from branch does not work

From: Hans-Joachim Matheus
Subject: Joining new files from branch does not work
Date: Tue, 21 Dec 2004 13:53:09 +0100


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
Checking in a.txt;
/opt/cvsroot/myproject/blub/Attic/a.txt,v  <--  a.txt
new revision:; previous revision: 1.1
~/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?


reply via email to

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