Integrate and Resolve in 2011.1 Sam Stafford Developer

P4 INTEGRATE, TAKE THREE

BASE SCORING AS IT WAS

#1 + #3 = 4

#2 + #3 = 5

Selected base

BASE SCORING AS IT WILL BE

1

1

1 1

2 4

4 Selected base

+1

+1 +1

+1

AVOIDING RE-INTEGRATION

INTEGRATING INTO MOVED FILES

INTEGRATING BETWEEN MOVED FILES

?

c:\client\B\C\F - resolving move to //depot/B/D/E Filename resolve: at: //depot/B/D/E ay: //depot/B/C/F am: //depot/B/D/F Accept(a) Skip(s) Help(?) am: a //depot/B/D/F - moved from //depot/B/C/F

OTHER NEW TYPES OF RESOLVE

Delete resolve: at: delete ay: ignore Accept(at/ay) Skip(s) Help(?) s:

Filetype resolve: at: (text+x) ay: (text+k) am: (text+kx) Accept(a) Skip(s) Help(?) am:

Branch resolve: at: branch ay: ignore Accept(at/ay) Skip(s) Help(?) s:

NEW C++ CLIENT API FUNCTIONALITY

ClientUser::Resolve( ClientResolveA *r, int preview, Error *e );

To perform a non-content resolve interactively:

•  Build with 2011.1+ client libraries •  Leave “api” protocol at 70+ •  Use the new ClientResolveA class to implement this method:

The server will avoid scheduling resolves that the client does not know how to support, and under that circumstance it will error gracefully if asked to perform an already-scheduled resolve.

Q&A