[p4] Integrating between branches with jobs

Robert Cowham robert at vaccaperna.co.uk
Fri Jun 15 02:56:56 PDT 2007


You are quite correct - fixes/changes -i produce a set of ALL fixes/changes
since the start. Thus doing a "set subtraction" is necessary.

Another unfortunate side effect of this is that the server may have to do
rather a lot of work to pull back the information. It would certainly be
nice to have the ability to more easily restrict things down (-m flag isn't
sufficient), but there are a ton of edge cases to consider.

> -----Original Message-----
> From: Martin, Ralf [mailto:RMartin at harmanbecker.com] 
> Sent: 15 June 2007 10:40
> To: Robert Cowham; Neil Carson; perforce-user at perforce.com
> Subject: AW: [p4] Integrating between branches with jobs
> 
> correct me if I am wrong, where I am not 100% sure about is 
> the need to call it twice to avoid false positives...
> 
> First:
> p4 fixes -i //depot/some/branch/... at 1,<your CL BEFORE Integration>
> Second:
> p4 fixes -i //depot/some/branch/... at 1,<your CL AFTER Integration>
> 
> and make a diff to get *only* the changes to that 
> integration. We did the same with "p4 changes -i" and wrote a 
> tool for that.
> Otherwise if there is a branch of a file in your source 
> branch, all changelists upon to the first revision of that 
> file will be reported and this is wrong.
> 
> Ralf
> 
> >-----Ursprüngliche Nachricht-----
> >Von: perforce-user-bounces at perforce.com
> >[mailto:perforce-user-bounces at perforce.com] Im Auftrag von Robert 
> >Cowham
> >Gesendet: Mittwoch, 13. Juni 2007 10:29
> >An: 'Neil Carson'; perforce-user at perforce.com
> >Betreff: Re: [p4] Integrating between branches with jobs
> >
> >You report on job associations via "p4 fixes //depot/some/branch/..."
> >
> >If you want to find out what has been fixed indirectly via 
> >integrations, then it is just:
> >
> >	p4 fixes -i //depot/some/branch/...
> >
> >This is like p4 changes which also takes the -i flag.
> >
> >Robert
> >
> >> -----Original Message-----
> >> From: perforce-user-bounces at perforce.com
> >> [mailto:perforce-user-bounces at perforce.com] On Behalf Of 
> Neil Carson
> >> Sent: 13 June 2007 00:33
> >> To: perforce-user at perforce.com
> >> Subject: [p4] Integrating between branches with jobs
> >> 
> >> Hi folks
> >>  
> >> Is there a way to carry associated jobs (and preferably the old 
> >> changelist description) with an integrate, when integrating a 
> >> changelist between branches? So that jobs fixed on the 
> mainline also 
> >> show associated with the changelist on the branch as well?
> >Or is this
> >> somehow considered a bad practice?
> >>  
> >> This has been bugging me for a little while, and I'm 
> curious to get 
> >> folks' thoughts...
> >_______________________________________________
> >perforce-user mailing list  -  perforce-user at perforce.com 
> >http://maillist.perforce.com/mailman/listinfo/perforce-user
> > 
>  
> *******************************************
> Harman Becker Automotive Systems GmbH
> Geschaeftsfuehrung:  Dr. Peter Geiselhart  -  Michael Mauser  
> -  William S. Palin -  Edwin Summers  -  Regis Baudot Sitz 
> der Gesellschaft: Karlsbad - Registergericht: Mannheim HRB 361395
>  
> *******************************************
> Diese E-Mail enthaelt vertrauliche und/oder rechtlich 
> geschuetzte Informationen. Wenn Sie nicht der richtige 
> Adressat sind oder diese E-Mail irrtuemlich erhalten haben, 
> informieren Sie bitte sofort den Absender und loeschen Sie 
> diese Mail. Das unerlaubte Kopieren sowie die unbefugte 
> Weitergabe dieser Mail ist nicht gestattet.
> This e-mail may contain confidential and/or privileged 
> information. If you are not the intended recipient (or have 
> received this e-mail in error) please notify the sender 
> immediately and delete this e-mail. Any unauthorized copying, 
> disclosure or distribution of the contents in this e-mail is 
> strictly forbidden.
> *******************************************
> 



More information about the perforce-user mailing list