LOGACTIONS_UNMERGED = 0x00000010,\r
LOGACTIONS_CACHE = 0x00000020,\r
LOGACTIONS_COPY = 0x00000040,\r
+ LOGACTIONS_MERGED = 0x00000080,\r
+ LOGACTIONS_FORWORD = 0x00000100,\r
LOGACTIONS_UNVER = 0x80000000,\r
LOGACTIONS_IGNORE = 0x40000000,\r
//LOGACTIONS_CONFLICT = 0x20000000,\r
*/\r
void SetFromGit(const char* pPath);\r
void SetFromGit(const char* pPath, bool bIsDirectory);\r
+ void SetFromGit(const TCHAR* pPath, bool bIsDirectory);\r
void SetFromGit(const CString& sPath,CString *OldPath=NULL);\r
\r
/**\r
* Returns true if the path points to a directory\r
*/\r
bool IsDirectory() const;\r
+\r
+ CTGitPath GetSubPath(CTGitPath &root);\r
+\r
/**\r
* Returns the directory. If the path points to a directory, then the path\r
* is returned unchanged. If the path points to a file, the path to the \r
*/\r
bool HasAdminDir() const;\r
bool HasAdminDir(CString *ProjectTopDir) const;\r
+ bool HasSubmodules() const;\r
\r
/**\r
* Checks if the path point to or below a Subversion admin directory (.Git).\r