Jump to content


kevinhoque

Member Since 19 Jun 2020
Offline Last Active Jun 23 2020 08:09 AM
-----

Posts I've Made

In Topic: Modify integrated moved/renamed file prior to submission

22 June 2020 - 06:18 PM

Sambwise, that worked! I am now able to shelve the file.  Thanks you so much! :) I really appreciate all the time you have spent with me to get this working! :)

Have a great rest of your day! :)

In Topic: Modify integrated moved/renamed file prior to submission

22 June 2020 - 05:52 PM

Yes that's correct Sambwise, the merges were not automatic, as there were several conflicts that I needed to resolve.  After the integrations and manual resolves I edited the files to fix the compile and logic errors.

I am wondering, once I have done this, will perforce be aware of the integrations for operations like "Revision Graph"?  At this stage, I will just be happy for the files to be in a state that I can work with them again.  Just curious about the integration history information.

Thanks! :)

In Topic: Modify integrated moved/renamed file prior to submission

22 June 2020 - 05:08 PM

Oh dear! I deserved that one :)

Here you go:

C:\Users\Kevin.hoque>p4 resolved T:\branches\warhammer3\warscape_staging\common\BOB\WarscapeShared\action_tree.cpp
T:\branches\warhammer3\warscape_staging\common\BOB\WarscapeShared\action_tree.cpp - merge from //branches/3k/dev/common/BOB/WarscapeShared/action_tree.cpp#2
T:\branches\warhammer3\warscape_staging\common\BOB\WarscapeShared\action_tree.cpp - moved from //branches/warhammer3/warscape_staging/common/BOB/Plugins/Cs2/action_tree.cpp#1,#3
T:\branches\warhammer3\warscape_staging\common\BOB\WarscapeShared\action_tree.cpp - resolved move (copy from //branches/warhammer3/warscape_staging/common/BOB/WarscapeShared/action_tree.cpp)
T:\branches\warhammer3\warscape_staging\common\BOB\WarscapeShared\action_tree.cpp - merge from //common/BOB/WarscapeShared/action_tree.cpp#10

Thanks Sambwise! :)

In Topic: Modify integrated moved/renamed file prior to submission

22 June 2020 - 04:48 PM

Hi Sambwise.  Is this what you wanted me to do?  

C:\Users\Kevin.hoque>p4 resolved T:\\branches\\warhammer3\\warscape_staging\\common\\BOB\\WarscapeShared\\action_tree.cpp
T:\\branches\\warhammer3\\warscape_staging\\common\\BOB\\WarscapeShared\\action_tree.cpp - no file(s) resolved.

It didn't seem to do much, but no obvious error messages...Sorry if I got it wrong again!

Adding a screen grab of the changelist, as it might be helpful..

Attached File  p4v_changelist.jpg   121.02K   14 downloads

Thanks! :)

In Topic: Modify integrated moved/renamed file prior to submission

22 June 2020 - 04:19 PM

Yes, for this task, I need to integrate 5 changelists - only once I have all 5 will the feature be in a working state and I would submit then.  Ordinarily this isn't a problem.  But this file rename/move, from the first integration CL, has changed all that :)

This is the output from the "resolved":


C:\Users\Kevin.hoque>p4 resolved //branches/warhammer3/warscape_staging/common/BOB/WarscapeShared/action_tree.cpp
T:\branches\warhammer3\warscape_staging\common\BOB\WarscapeShared\action_tree.cpp - resolved move (copy from //branches/warhammer3/warscape_staging/common/BOB/WarscapeShared/action_tree.cpp)

Hope this helps :)

Just noticed that the copy from is not what I expected it to be. I thought it would be:

//branches/warhammer3/warscape_staging/common/BOB/Plugins/Cs2/action_tree.cpp