integrate - unresolved files say 'nothing to resolve'integrate resolve unresolved
Posted 12 May 2015 - 10:55 AM
I'm trying to integrate some files but can't get them to resolve. I did this many times before but now when I right-click and select 'resolve' I get a pop-up box saying "There are no files that need resolving" even though the files still have a question mark against them and when trying to 'submit' I get error "Unresolved: Resolve this file before submitting" as expected. Does anyone have an idea how I can resolve these please?
My exact steps where these:
-right click on folder
-pick source and target folders
-select start and end changelists
-select '-f' option
-right click on pending changelist
-select 'get latest revision'
-select 'check out'
-> pop up says nothing to resolve, but files still have question marks and can't be submitted
-> I did the exact sequence many times before and it always worked but now it doesn't, I tried different files, folders, options, restarted, no difference...
I'm using this Perforce version: Visual Client/NTX86/2007.3/149519.
Did anyone else get this problem too?
Posted 12 May 2015 - 04:52 PM
Posted 13 May 2015 - 09:32 AM
Posted 13 May 2015 - 01:38 PM
Posted 13 May 2015 - 03:11 PM
p4 resolve -n
This should tell us the server version and what exactly needs resolving.
Posted 15 May 2015 - 01:05 PM
Posted 15 May 2015 - 02:32 PM
p4 resolve n lists the files saying 'no file(s) to resolve' after each, but when trying to submit it tells me the files need resolving (and they really do)
Posted 15 May 2015 - 03:10 PM
First let's get you set up to be able to run commands from the command line. Do:
p4 set P4PORT=<server:port> p4 set P4USER=<username> p4 set P4CLIENT=<workspace>
Make all of these exactly the same as how you have them set in P4V -- the server:port and username are in the title bar, and the workspace is in the dropdown over the depot/workspace tab. Once you have them set correctly, "p4 info" should confirm that it's right by showing you your connection information. (If you get messages like "connection error" or "client unknown" it means something's not set the same way it's set in P4V.)
p4 opened p4 resolve -am p4 submit -c <change>
where <change> is the changelist that P4V's not letting you submit.
If you can copy and paste the output of all these commands, and they aren't doing what you expect, seeing the output may help me figure out what needs to be fixed.
Posted 16 May 2015 - 11:44 PM
Posted 17 May 2015 - 12:09 AM
As an example, here's what it looks like when I run a "p4 set" command to set my P4PORT and then another to check that it's set:
C:\p4\public>p4 set p4port=public.perforce.com:1666 C:\p4\public>p4 set p4port P4PORT=public.perforce.com:1666 (set)
Posted 18 May 2015 - 09:48 AM
I tried the resolve -am comand as above too, and that did resolve all files, so that's strange since they didn't resolve in the GUI which I tried first again. So at least I can get these files resolved now, even though I wonder why it's different between command line and GUI.
Thanks for your help with this!
Posted 18 May 2015 - 05:13 PM
Posted 18 May 2015 - 10:55 PM
Diff chunks: 0 yours + 1 theirs + 2 both + 0 conflicting
In the GUI it listed each file followed by: no file(s) to resolve
Do you mean that the command line would have ran a newer version than the client? Is that possible? I've ran both on my PC with the older client, and it didn't resolve using the GUI but did resolve in the CL, I tried several times...
Posted 18 May 2015 - 11:10 PM
Posted 18 May 2015 - 11:19 PM
Posted 19 May 2015 - 09:02 AM
Posted 19 May 2015 - 10:46 AM
Just now as a test I tried this on a file that has not changed in either source or target: (in the GUI) integrate using -f, get latest revision, check out file, resolve -> it tells me that there are no files to resolve, submit -> it tells me the file needs resolving first
then in the command line I typed "p4 resolve -am" which looked like this (I shortened the path names for readability):
C:\>p4 resolve -am
c:\P4\Dev\check.h - merging //depot/App/Rel/check.h#1
Diff chunks: 0 yours + 0 theirs + 0 both + 0 conflicting
//andrea/Dev/check.h - copy from //depot/App/Rel/check.h
Posted 19 May 2015 - 04:54 PM
Posted 20 May 2015 - 09:23 AM
Last time I upgraded Perforce on my machine I regretted it since it was unusably slow, and it was very difficult to get the previous version back, so I'm a bit reluctant to try again... Since this stopped working altogether though and it seems I get it for every file now I might not have a choice, maybe I can find someone with a newer version to try first.
Posted 07 July 2015 - 12:21 PM
It is since updating P4D from 2012.1 to P4D version 2015.1.
The affected P4V client is X86 2010.1.
In my case the file (ascii) really needs a manual merge because a colleague has made changes to the same lines as I did.
0 user(s) are reading this topic
0 members, 0 guests, 0 anonymous users