Re: Moving files onto an existing branch

[Dan Langille]

On 11 Feb 2002 21:26:32 -0600, address@hidden (Pierre Asselin) wrote:

> Dan Langille <address@hidden> writes:
> 
> >I have files which exist on the main trunk but not on the branch.  I'd like
> >them to exist on the branch as well.
> 
> >For example, this file exists on the branch:
> 
> >$ cvs stat index.php
> >===================================================================
> >File: index.php         Status: Up-to-date
> 
> >   Working revision:    1.1.2.10
> >   Repository revision: 1.1.2.10        
> > /home/repositories/freshports-1/www/Attic/index.php,v
> >   Sticky Tag:          FreshPorts2 (branch: 1.1.2)
> >   Sticky Date:         (none)
> >   Sticky Options:      (none)
> 
> >This file does not exist on the branch but I would like it to:
> 
> >$ cvs stat pkg_process.inc
> >===================================================================
> >File: pkg_process.inc   Status: Up-to-date
> 
> >   Working revision:    1.5
> >   Repository revision: 1.5     
> > /home/repositories/freshports-1/www/pkg_process.inc,v
> >   Sticky Tag:          (none)
> >   Sticky Date:         (none)
> >   Sticky Options:      (none)
> 
> >How do I active that goal please?
> 
> Does the branch tag "FreshPorts2" exist in pkg_process.inc ?  Do
> a "cvs status -v" on it to find out.

well, bugger me....

$ cvs status -v pkg_process.inc
===================================================================
File: pkg_process.inc   Status: Up-to-date

   Working revision:    1.5
   Repository revision: 1.5     
/home/repositories/freshports-1/www/pkg_process.inc,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        FreshPorts2                     (branch: 1.5.2)

> If the branch tag is there, do "cvs update -rFreshPorts2 pkg_process.inc"

Actually, all I tried was: 

$ ls -l pkg_process.inc
ls: pkg_process.inc: No such file or directory
$ cvs update pkg_process.inc
U pkg_process.inc
$
> If the branch tag is not there, create it first with
> "cvs tag -b FreshPorts2 pkg_process.inc" , then run the "cvs update"
> command above.  This assumes that you want FreshPorts2 to start off of
> revision 1.5 in pkg_process.inc .

Thank you.  It appears I was doing the right thing but I was concluding I
was not succeeding.  I was checking "cvs status pkg_process.inc" without
the -v.

Looking back in my command history, I found:

 cvs -q tag -b FreshPorts2 pkg_process.inc pkg_upload.php pkg_utils.inc

Checking "cvs stat -v pkg_upload.php and pkg_utils.inc", I've found:

   Existing Tags:
        FreshPorts2                     (branch: 1.5.2)

Which is good.

Thank you Pierre.

Background for those that may be interested:  The FreshPorts project takes
output from a cvs log mailing list, parses it into XML, then loads the
results into a database.  You can register your interest in particular part
of the tree, and receive email notification of any changes in those parts.
It's actually a bit more complex than that as it deals (for now) just with
the FreeBSD Ports tree.  But I have another project,
http://FreshSource.org/ which will work for any source tree (the FreeBSD
tree first).
-- 
Dan Langille - novice in training