Re: commit to branch

[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 no point in specifying the branch explicitly).
> 
> > I have a file on the main trunk with Up-to-date status and want to
> > commit the *same* file to a branch.
> 
> Then merge it.  In a working directory on the branch, do:
> 
>         cvs up -j HEAD TestFile.java
>         cvs ci -m "message" TestFile.java
> 
> -Larry Jones
> 

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 software and when doing
bug fixes that applies to the main trunk as well as to the branch, I
have to merge it in the second working where the branch is checked out
and resolve conflicts.

Is it possible to add a support to force commit to a different branch
without having to do merging and resolving conflicts ? Otherwise -r
option to commit has not much sense IMO if it doesn't work in this case.
It would speed up my work.

Thanks,
Martin