// // Copyright 1997 Nicholas J. Irias. All rights reserved. // // // Cmd_AutoResolve.h // #include "P4Command.h" class CCmd_AutoResolve : public CP4Command { // Construction public: CCmd_AutoResolve(CGuiClient *client=NULL); DECLARE_DYNCREATE(CCmd_AutoResolve) BOOL Run(CStringList *files, int type, BOOL preview, BOOL force, BOOL textmerge, int whtSp); CStringList *GetList() { return &m_StrListOut; } BOOL IsPreview() { return m_Preview; } // Attributes protected: BOOL m_Preview; BOOL IsValidMergeMessage(CString const & data); // CP4Command overrides virtual void OnOutputInfo(char level, LPCTSTR data, LPCTSTR msg); };
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 19924 | YourUncleBob |
Populate -o //guest/perforce_software/p4win/... //guest/YourUncleBob/p4win/..... |
||
//guest/perforce_software/p4win/main/gui/p4api/Cmd_AutoResolve.h | |||||
#1 | 16169 | perforce_software | Move files to follow new path scheme for branches. | ||
//guest/perforce_software/p4win/gui/p4api/Cmd_AutoResolve.h | |||||
#1 | 8562 | Matt Attaway |
These feet never stop running. Initial commit of the P4Win source code. To the best of our knowledge this compiles and runs using the 2013.3 P4 API and VS 2010. Expect a few changes as we refine the build process. Please post any build issues to the forums. |