Re: [p4] Integration branch makes change lists anonymous

It helps terrifically. We had planned to do just such an integration
script for automation and convenience. Now we'll include your ideas.

Thanks,

~Lan

-----Original Message-----
From: perforce-user-bounces@xxxxxxxxxxxx
[mailto:perforce-user-bounces@xxxxxxxxxxxx] On Behalf Of Brad Holt
Sent: Thursday, December 15, 2005 8:46 AM
To: perforce-user@xxxxxxxxxxxx
Cc: Belmore, Brad; Garrett, Bonita; Houck, Bill; Vue, Beau
Subject: Re: [p4] Integration branch makes change lists anonymous


We had a similar problem as we use bags of development branches.  I
wound up writing a script that basically ran through the changelists
submitted on the source branch, and integrated them, in order, 1 by 1.
The comments for the integration submission included the comments and
original changelist info of the original changelist.  This preserved all
the information that was needed, and kept the changes integrated on
their by-change basis.  If a user knows of a change that should not be
included in the target branch, they put a flag in their original
changelist that instructs the resolve step to do an "-ay".  It also
requires a branchspec be passed in which any moved files need to be so
mapped.

I'd send you the script, but unfortunately it is hopelessly jumbled with
the CCB automation that it was written for.  One of these days hopefully
I'll unjumbleify it.

There was a talk given 2 P4 conferences ago as I recall where someone
talked about this type of merging -
http://www.perforce.com/perforce/conf2003/index.html - "Merge as You
Go".

Hope this helps.


-----Original Message-----
From: perforce-user-bounces@xxxxxxxxxxxx
[mailto:perforce-user-bounces@xxxxxxxxxxxx] On Behalf Of Barnes, Lan
Sent: Wednesday, December 14, 2005 3:57 PM
To: perforce-user@xxxxxxxxxxxx
Cc: Belmore, Brad; Houck,Bill; Garrett,Bonita; Vue, Beau
Subject: [p4] Integration branch makes change lists anonymous

In order to give our developers the freedom they demand, our SCM group
accepts their code for builds to go to QA by integrating from their
branches to a //Integration/... branch that only we have rights to. Thus
if they have a release in //foo/... and //bar/..., we do an "accept
theirs" integration into //Integration/foo/... and //Integration/bar/...

This works perfectly insofar as it goes. The problem is that the
changelists generated by the integration are divorced from their code
change history. Additionally, since many of our builds are done by a
build-user ID, the change lists become a long list of apparently
unrelated stuff. Couple with this an occasional reintegration ("Oh, I
forgot to check this in ..."), and we find our branch pretty much
divorced from history.

Other people must have grappled with this problem. Is there something
we're missing or perhaps some magic script or technique that will rescue
us?

TIA,

~Lan Barnes
Principal SCM Analyst 
Alaris Medical Systems
Cardinal Health

_______________________________________________
perforce-user mailing list  -  perforce-user@xxxxxxxxxxxx
http://maillist.perforce.com/mailman/listinfo/perforce-user


_______________________________________________
perforce-user mailing list  -  perforce-user@xxxxxxxxxxxx
http://maillist.perforce.com/mailman/listinfo/perforce-user


_______________________________________________
perforce-user mailing list  -  perforce-user@xxxxxxxxxxxx
http://maillist.perforce.com/mailman/listinfo/perforce-user