Re: [p4] Missed Integration
Sambwise <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'Sambwise'. This graph doesn't make sense to me -- why did feature#6 get copied to 1.18#2? They should have already been identical, and even after forcing that integrate, everything else should be showing nothing to do. It seems like something trickier is going on here I did take a whack at reproducing this setup given what's on the graph and all the results come out pretty much like I'd expect (i.e. nothing to do from any of those commands -- that's the three "pass" results given by the commands executed at the end of the script): C:\Perforce\test>perl itest.pl itest.txt 2.f1 - all revision(s) already integrated. pass (A) : ichanges 2.f1 2.f2 0 pass (A) : !integ 2.f1 2.f2 pass (A) : !integ 2.f1#5,5 2.f2 C:\Perforce\test>type itest.txt add 0.f1 branch 0.f1 1.15 branch 1.15 2.f1 branch 2.f1 2.f2 edit 0.f1 edit 1.15 copy 1.15 2.f1 copy 2.f1 2.f2 edit 1.15 dirty 1.15 2.f1 dirty 2.f1 2.f2 edit 1.15 copy 1.15 2.f1 copy 2.f1 2.f2 copy 1.15 0.f1 branch 1.15 1.16 branch 1.16 1.17 branch 1.17 1.18 -f copy 0.f1 1.18 -f copy 1.18 2.f1 test ichanges 2.f1 2.f2 0 test !integ 2.f1 2.f2 test !integ 2.f1#5,5 2.f2 Here's my rev graph (looks pretty much like yours, with the stuff to the left that I can't see kinda trimmed off): [attachment=413:dclyde1.png] If you can tweak that itest script to more accurately reflect what's going on so I can make it happen too (I'm guessing there are a couple of extra hidden steps that'll turn out to be significant) then I ought to be able to explain what subtlety is at play here. Certainly seems... weird. -- Please click here to see the post in its original format: http://forums.perforce.com/index.php?/topic/5528-missed-integration _______________________________________________ perforce-user mailing list - [email protected] http://maillist.perforce.com/mailman/listinfo/perforce-user