Re: trouble with cvs add

[Russ Sherk]

To do a merge, you type something like:
cvs co -rBRANCH_1_2
cvs up -jHEAD myNewFile myNewFile2 myNewFile3 [...]

Then cvs should say something like adding new file blah... use cvs ci
to commit changes.

Carefully check that all files where brought over correctly.  Then
check them in.

--Russ

On Apr 12, 2005 11:17 AM, Martín Marqués <address@hidden> wrote:
> El Dom 10 Abr 2005 18:55, Pierre Asselin escribió:
> > Mart?n Marqu?s <address@hidden> wrote:
> >
> > > I have a project with some branches. One of those branches is a
> > > posible 1.2 release in which we are working out some problems. The
> > > thing is that I add some files to the HEAD which I need in the 1.2
> > > release, but I just can't add it to the branch because it says that
> > > the files (and directories) already exist.
> >
> > 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?
> 
> --
>  12:15:56 up 10 days, 20:44,  2 users,  load average: 1.15, 0.95, 0.90
> -----------------------------------------------------------------
> Martín Marqués        | select 'mmarques' || '@' || 'unl.edu.ar'
> Centro de Telematica  |  DBA, Programador, Administrador
>              Universidad Nacional
>                   del Litoral
> -----------------------------------------------------------------
> 
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/info-cvs
>