[p4] One "p4 open" command opens two revisions of one file!
Rick Macdonald
rickmacd at shaw.ca
Tue Jan 12 09:24:03 PST 2010
Robert, I did a test of syncing to an old version and opening it for
edit. I only get the "#83 opened for edit" message and the "must
resolve" message. I do not get an additional message about the head
revision.
Our server version is 2007.3 if that matters. p4 versions vary, but I
used 2008.2 in my test.
Rick
Robert Cowham wrote:
> Rick
>
> Looks fine to me - it is what I would expect if you try and edit an old
> version (in this case the user was synced to #83 when the #head was #96).
>
> It is only one file actually open (//depot/path/filename.cpp) - the key
> thing is that it doesn't how the resolve is going to happen, because you
> could do things like:
>
> P4 sync #84
> P4 resolve -ay # keep yours and reject #84
> P4 sync # sync's to head
> P4 resolve -am # merge in
>
> While it is easy to sync/resolve to any verison or combination of versions
> (incrementally), you can of course only check in a new head version.
>
> Robert
>
>
>> -----Original Message-----
>> From: perforce-user-bounces at perforce.com
>> [mailto:perforce-user-bounces at perforce.com] On Behalf Of Rick
>> Macdonald
>> Sent: 12 January 2010 15:31
>> To: Perforce Users Mailing List
>> Subject: [p4] One "p4 open" command opens two revisions of one file!
>>
>> Has anybody seen this before?
>>
>> % p4 open //depot/path/filename.cpp
>> //depot/path/filename.cpp#83 - opened for edit ...
>> //depot/path/filename.cpp - must sync/resolve #84,#96 before
>> submitting
>> //depot/path/filename.cpp#96 - opened for edit
>>
>> How could one "p4 open" command open two revisions of one
>> file? I know the warning about resolving can be from opening
>> an old revision of I file, but I can't figure out how the
>> head revision #96 is also being opened. The clientspec _does_
>> specify the hostname. I can't investigate further since the
>> situation is gone now, having been cleaned up by some forced
>> syncs, opens and submits.
>>
>> Could a user cause this or was the metadata messed up? If it
>> was a metadata problem, is there any p4/p4d check for such problems?
>>
>> The clientspec view is very simple, as shown below. There is
>> a parent-child integration relationship between parentPath
>> and path, but neither of the file revisions opened above are
>> from the parentPath.
>>
>> View:
>> //depot/parentPath/... //myClient/my/src/...
>> //depot/path/... //myClient/my/dev/myProject/...
>> -//depot/path/DATA/... //myClient/xp/dev/myProject/DATA/...
>>
>> I don't see anything interesting in the filelog of the file:
>>
>> ... #96 change 259709 edit on 2010/01/07 by username at myClient
>> (text) 'Backup '
>> ... #95 change 259622 edit on 2010/01/06 by username at myClient
>> (text) 'Backup '
>> ... #94 change 259544 edit on 2010/01/05 by username at myClient
>> (text) 'Backup '
>> ... #93 change 259533 edit on 2010/01/05 by username at myClient
>> (text) 'Daily backup '
>> ... #92 change 259480 integrate on 2010/01/05 by
>> username at usernamecrwprg033 (text) 'Got the latest code '
>> ... ... copy from //depot/parentPath/to/filename.cpp#58
>> ... #91 change 258328 edit on 2009/12/04 by username at myClient
>> (text) 'backup '
>> ... ... copy into //depot/parentPath/to/filename.cpp#57
>> ... #90 change 258322 integrate on 2009/12/04 by
>> username at usernamecrwprg033 (text) 'Got the latest code '
>> ... ... copy from //depot/parentPath/to/filename.cpp#54,#56
>> ... #89 change 254440 edit on 2009/10/09 by username at myClient
>> (text) 'Backup '
>> ... ... copy into //depot/parentPath/to/filename.cpp#53
>> ... #88 change 252657 edit on 2009/09/15 by username at usernamecrwprg033
>> (text) 'Backup '
>> ... ... copy into //depot/parentPath/to/filename.cpp#52
>> ... #87 change 251754 edit on 2009/09/01 by username at myClient
>> (text) 'Backup '
>> ... #86 change 251140 edit on 2009/08/21 by username at myClient
>> (text) 'Backup '
>> ... #85 change 251046 edit on 2009/08/20 by username at myClient
>> (text) 'backup '
>> ... #84 change 251045 edit on 2009/08/20 by username at usernamecrwprg033
>> (text) 'Backup '
>> ... #83 change 247529 edit on 2009/07/06 by username at myClient
>> (text) 'Backup '
>> ... ... copy into //depot/parentPath/to/filename.cpp#51
>> ... #82 change 247310 edit on 2009/07/01 by username at myClient
>> (text) 'Backup '
>> ... ... copy into //depot/parentPath/to/filename.cpp#50
>> ... #81 change 246869 integrate on 2009/06/25 by
>> username at usernamecrwprg033 (text) 'Got the latest code '
>> ... ... copy from //depot/parentPath/to/filename.cpp#45,#49
>> ... #80 change 246773 edit on 2009/06/24 by username at myClient
>> (text) 'Backup '
>> ... ... copy into //depot/parentPath/to/filename.cpp#44
>>
>> Rick
>> _______________________________________________
>> 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