[p4] Getting source view and target view for resolve command
san_scm at live.com
Thu Apr 24 06:05:36 PDT 2008
Scenario: I have two branches in my perforce repository viz. 'Mainstream' and 'Branch'. Development goes on in both branches. Now, I want to merge Branch to Mainstream and resolve. I have created a batch script to do this. The batch script will generate an html report which shows the list of files still with conflict.
Problem: In the report, I am able to generate the target view of the conflict resolution. i.e., only //depot/Mainstream/test.txt is shown in the report. I want //depot/Branch/test.txt also. I am using p4 resolve -n command for getting the list of conflicted files.
Has anyone come across such a scenario? Can anybody help me out?!!
Thanks in advance...
Ch, TN, IN.
Education: Are exams worrying you all the day long? Write to MSN education experts for help.
More information about the perforce-user