Re: commit to branch

2001-03-21 Thread Derek R. Price
Martin Entlicher wrote: Yes, thanks for the replies. I know, that I can do a merge on the branch with the HEAD. But I thought, that "cvs ci -r .." makes it simpler. I want to have two exactly the same revisions on the main trunk and on the branch. We have branched stable version of our

Re: commit to branch

2001-03-21 Thread Stephen Rasku
You can also use the "-p" option. To give the same version to a branch to what is on the trunk: cvs update -r branch cvs update -A -p file file cvs ci You have to repeat the middle step for each file you need to check in. Unfortunately, if you have a lot of

commit to branch

2001-03-20 Thread Martin Entlicher
Hi, Can please someone explain to me when commit to a branch is supposed to work ? I have a file on the main trunk with Up-to-date status and want to commit the *same* file to a branch. But when I do: cvs ci -m "message" -r MyBranch TestFile.java it fails with: cvs commit: Up-to-

Re: commit to branch

2001-03-20 Thread Larry Jones
Martin Entlicher writes: Can please someone explain to me when commit to a branch is supposed to work ? I believe the only time that's valid is with a newly-added file or if the existing file is already the most recent revision on the branch (in which case there's no point in specifying

Re: commit to branch

2001-03-20 Thread Martin Entlicher
Larry Jones wrote: Martin Entlicher writes: Can please someone explain to me when commit to a branch is supposed to work ? I believe the only time that's valid is with a newly-added file or if the existing file is already the most recent revision on the branch (in which case there's