WebSVN – spk – Diff – //libspk/src/Packages.cpp



	}
 
	return list;
}
 
bool CPackages::CanWeMerge(const Utils::String &file) const
{
	return CModDiff::CanBeDiffed(file);
}
 
bool CPackages::NeedToMerge(CyString file)

		}
		else if ( status == -1 )
		{
			if ( this->NeedToMerge(str->str) )
			{
				if ( this->CanWeMerge(str->str.ToString()) )
					conflicts.PushBack(str->str);
				else if ( cantMerge )
					cantMerge->PushBack(str->str, "-1");
			}
			else

Rev 57	Rev 58
Line 7837...	Line 7837...
7837	`}`	7837	`}`
7838		7838
7839	`return list;`	7839	`return list;`
7840	`}`	7840	`}`
7841		7841
7842	`bool CPackages::CanWeMerge(CyString file)`	7842	`bool CPackages::CanWeMerge(const Utils::String &file) const`
7843	`{`	7843	`{`
7844	`return CModDiff::CanBeDiffed(file);`	7844	`return CModDiff::CanBeDiffed(file);`
7845	`}`	7845	`}`
7846		7846
7847	`bool CPackages::NeedToMerge(CyString file)`	7847	`bool CPackages::NeedToMerge(CyString file)`
Line 7890...	Line 7890...
7890	`}`	7890	`}`
7891	`else if ( status == -1 )`	7891	`else if ( status == -1 )`
7892	`{`	7892	`{`
7893	`if ( this->NeedToMerge(str->str) )`	7893	`if ( this->NeedToMerge(str->str) )`
7894	`{`	7894	`{`
7895	`if ( this->CanWeMerge(str->str) )`	7895	`if ( this->CanWeMerge(str->str.ToString()) )`
7896	`conflicts.PushBack(str->str);`	7896	`conflicts.PushBack(str->str);`
7897	`else if ( cantMerge )`	7897	`else if ( cantMerge )`
7898	`cantMerge->PushBack(str->str, "-1");`	7898	`cantMerge->PushBack(str->str, "-1");`
7899	`}`	7899	`}`
7900	`else`	7900	`else`

Subversion Repositories spk

(root)//libspk/src/Packages.cpp – Rev 57 → 58