[p4] Resolving a file wierdness

[Joseph Fota]

This is what I did to get to the "p4 resolve":

 

cd /home/builds/main

p4 integ -rb dev

p4 resolve -as 

 

 

One file with a conflict to resolve:

 

p4 resolve pr/libpla/src/plawindow.dgeni

/home/build/main/pr/libpla/src/plawindow.dgeni - merging
//depot/dev/pr/libpla/src/plawindow.dgeni#5,#10

Diff chunks: 4 yours + 1 theirs + 0 both + 1 conflicting

 

So, I edit the file to resolve the conflict.  I then notice that the one
(1) chunk in THEIRS does not exist in the file that I'm editing.

Doing a "dt" doesn't show the chunk that exists in
//depot/dev/pr/libpla/src/plawindow.dgeni .   But a "dy" does.  I
thought THEIRS was what was coming into your workarea.  

 

Regardless, selecting the edit option doesn't show the chunk at all.  

 

Doesn't the edit option give you the merged file plus the conflicts? 

 

____________________

 

Joseph J. Fota

Member of Technical Staff

Tabula, Inc.

3250 Olcott St.

Santa Clara, CA 95054

Ph: (408) 986-9140 x364

Fax: (408) 986-9146