RE: Vendor Branches

[John Birtley]

Thanks for the reply.  I'll try and write some scripts to do it the copy
and add way.

My sincere apologies for the HTML - I recently set up this machine and I
hadnt checked the mail format.  HTML was the default - thanks for
pointing it out.


> -Original Message-
> From: Greg A. Woods [mailto:[EMAIL PROTECTED]] 
> Sent: 04 January 2003 23:25
> To: John Birtley
> Cc: [EMAIL PROTECTED]
> Subject: Re: Vendor Branches
> 
> 
> [ On Saturday, January 4, 2003 at 20:05:46 (-), John 
> Birtley wrote: ]
> > Subject: Vendor Branches
> >
> > The problem is that I want to be able to copy the latest version on 
> > the vendor branch to the latest version on the INTEGRATION branch, 
> > since all integration testing and tagging is to be done from this 
> > branch, i.e.:
> 
> You cannot safely mix normal branches in modules with vendor 
> branches and still expect full and normal functionality from CVS.
> 
> To do what you want you'll have to manually "import" (i.e. 
> copy and add) new vendor releases to a normal branch and then 
> manually merge to the other branches you wish to maintain..
> 
> 
> BTW:
> 
> > 
> 
> Please DO NOT EVER send HTML, rich text, or otherwise 
> stylized e-mail, especially not to me or to any public 
> mailing list.  Not all mail readers will recognize such 
> formats, and their added volume is generally a total waste of 
> bandwidth, storage, and processing power for everyone. HTML 
> in particular is a potential security threat and many 
> firewalls and some mailing lists filter it entirely -- 
> especially since CERT and Microsoft have jointly anounced a 
> very major flaw in the HTML rendering engine used in all 
> Microsoft products (in versions still widely in use, and 
> which isn't even properly fixed in the most recent releases).
> 
> For more information see, for instance, the following article:
> 
  http://www.georgedillon.com/web/html_email_is_evil.shtml

Please send all your messages as plain text only.


-- 
Greg A.
Woods

+1 416 218-0098;<[EMAIL PROTECTED]>;
<[EMAIL PROTECTED]>
Planix, Inc. <[EMAIL PROTECTED]>; VE3TCP; Secrets of the Weird
<[EMAIL PROTECTED]>



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Vendor Branches

[John Birtley]

Title: Message



I wonder if 
anybody can help me with the following problem regarding multiple vendor 
branches.
 
I regularly 
receive code drops from vendors in the form of tarballs.  I want to untar 
them and then `cvs import' to the appropriate vendor branch.  Once they are 
on the vendor branch, I want to tag them and run some unit tests.  If the 
unit tests pass, I want to tag them again, marking them as ready for 
integration, sort of:
 
    tar xvf vendor.tar
    cd vendor
    cvs import -b 1.1.3 -m "Latest vendor drop" repository/vendor VENDOR 
VENDOR_LATEST_ddmm
    if (unit tests ok) 
    
cvs rtag -r VENDOR_LATEST_ddmm 
INTEGRATION_READY repository/vendor
    then
    fi
 
No problems 
there so far.
 
The problem 
is that I want to be able to copy the latest version on the vendor branch to the 
latest version on the INTEGRATION branch, since all integration testing and 
tagging is to be done from this branch, i.e.:
 
Before:
 

  +---+  
|  1.1  |
  +---+
   
\
    
\
 
\
  
\
   
/\
   
| VENDOR |
   \+---/
    
|

    
|
    
|
   
+++
   | 
1.1.3.1 |

   
+++    
|

   
+++
   | 
1.1.3.2 |    VENDOR_LATEST_ddmm
   
+++    INTEGRATION_READY
    

 
After:
 


  +---+  
|  1.1  |
  +---+---+
  |    
\
  | 
\
  |  
\
  |   
\
  |    
/\
  |    
| VENDOR |
  |\+---/
  | 
|

  | 
| 
  | 
|
  |    
+++
  || 
1.1.3.1 | 

  |    
+++  | 
|

  |    
+++
  || 
1.1.3.2 |    VENDOR_LATEST_ddmm 
  |    
+++    INTEGRATION_READY
  
|
  
| 

  +---+---+  
|  1.2  |   
MERGED-VENDOR_LATEST_ddmm
  +---+---+   
INTEGRATION
 
I 
have tried various permutations:
 
    cvs import 
    cd /tmp
    cvs checkout 
-rVENDOR_LATEST_ddmm repository
    cvs update -A
    cvs commit
 
and
 

    cvs import 
    cd /tmp
    cvs checkout -jINTEGRATION 
-rVENDOR_LATEST_ddmm repository
    cvs 
commit
 
But the 
`commit' part either does nothing, or reports 'up-to-date check' 
failures.
 
Is what I am 
hoping to do impossible?  Anybody dealt with a similar 
scenario?
 
Many thanks 
IA.
 
John.
 
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs