Re: trouble with cvs add

[Russ Sherk]

Pierre,

Why so complicated to merge a file from head to a branch?  I just ran
a little test and my recommended method works.  Martin has some files
that exist in HEAD but not in BRANCH_1_2.  Since they exist in the
repo, cvs says 'can't add this file because it exists'.  Since it
already exists, it only has to be merged into BRANCH_1_2:

cvs co -rBRANCH_1_2 MyModule
cd MyModule
cvs up -jHEAD path/to/file1 path/to/file2
U path/to/file1
U path/to/file2
cvs stat path/to/file1 path/to/file2
... Status: locally added
... Sticky Tag:         BRANCH_1_2 - MISSING from RCS file!
... Status: locally added
... Sticky Tag:         BRANCH_1_2 - MISSING from RCS file!
cvs ci path/to/file1 path/to/file2
cvs stat path/to/file1 path/to/file2
... Sticky Tag: BRANCH_1_2
...Sticky Tag:          BRANCH_1_2 (branch: 1.1.2)
... Sticky Tag: BRANCH_1_2
...Sticky Tag:          BRANCH_1_2 (branch: 1.1.2)

Am I missing something important?

Regards,

--Russ

On 4/12/05, Pierre Asselin <address@hidden> wrote:
> Mart?n Marqu?s <address@hidden> wrote:
> > El Dom 10 Abr 2005 18:55, Pierre Asselin escribi?:
> > >
> > > One way is to add them to the branch first, and then merge that change
> > > to the trunk.  But it's too late for that.
> 
> > How would this be done?
> 
> By deciding ahead of time that the files should be committed to the
> branch first, and only then merging that commit back to the trunk.
> 
> Starting from a trunk sandbox,
> 
>     cvs update -r the_branch_tag
> 
> and the sandbox is now on the branch.
> Create the files in this sandbox.  Then,
> 
>     cvs add file1 file2 ...
>     cvs commit
> 
> Finally, return to the trunk and merge
>     cvs update -A
>     cvs update -j the_branchpoint_tag -j the_branch_tag
> 
> This "cvs add"s the files to the trunk sandbox
> 
>     cvs commit
> 
> In your case it is too late to do that since the files
> are already present on the trunk.  However, I think
> you can make them appear on the branch just by tagging
> them like the rest.
> 
>     (on the trunk)
>     cvs tag -b the_branch_tag file1 file2 ...
>     cvs update -r the_branch_tag
>     (sandbox is now on the branch and the files should be there)
> 
> 
> --
> pa at panix dot com
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/info-cvs
>