[p4] p4 interchanges question
Robert Cowham
robert at vaccaperna.co.uk
Tue Oct 9 02:05:28 PDT 2007
Don't forget that interchanges is reporting changelists not revisions.
Also that if you integrate part of a changelist then you start getting
"incorrect" data (or double counted changelists).
So if foo.txt#3 is part of changelist 123 but there are some other files in
changelist 123, then interchanges will report that as needing to go across,
even though part of it has already gone.
For belt and braces in this type of reporting you have to treat interchanges
output with a pinch of salt and back it up with analysis of integ -n output.
Of course if your development process is such that people never integrate
partial changelists, your life will be easier...
Does that help?
Robert
> -----Original Message-----
> From: perforce-user-bounces at perforce.com
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of Wesley Hunt
> Sent: 09 October 2007 01:06
> To: perforce-user at perforce.com
> Subject: [p4] p4 interchanges question
>
> p4 interchanges seems to report all revisions after the 1st
> non-integrated revision as needing to be integrated,
> regardless of whether those revisions have been integrated.
> Does anyone know if this is intended or a bug?
>
> It only matters when one "cherry-picks" a change for
> integration. For example:
>
> <ASCII ART>
>
> BranchRelease: Foo.txt - #1 ----- #2 ----- #3
> ^ |
> (branch) | | (merge)
> | v
> BranchMain : Foo.txt - #1----------------#2
>
> [Let's please ignore the philosophical questions of whether
> this is a good idea (yes, I've read Practical Perforce,
> etc... :). That ship has unfortunately sailed]
>
> p4 interchanges -b ReleaseToMain
>
> will report change #2 AND #3 need to be integrated. Obviously running
>
> p4 integrate -b ReleaseToMain //...Foo.txt#3,#3
>
> will report
>
> all revisions already integrated.
>
> So it seems p4 interchanges is not handling cherry-picking...?
>
> -Wes
> _______________________________________________
> perforce-user mailing list - perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
More information about the perforce-user
mailing list