github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Svn conflict resolution tools improved

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11911 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-04-24 14:22:05 +00:00
parent e22a6587f3
commit a047e1f31d
1 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
uppsrc/ide/idebar.cpp
View file

@ -493,7 +493,9 @@ void Ide::FilePropertiesMenu(Bar& menu)
String mine;
String theirs;
String original;
if(editfile_repo == SVN_DIR)
Vector<String> r;
Vector<int> rn;
if(editfile_repo == SVN_DIR) {
for(FindFile ff(editfile + ".*"); ff; ff.Next()) {
if(ff.IsFile()) {
String p = ff.GetPath();
@ -501,10 +503,28 @@ void Ide::FilePropertiesMenu(Bar& menu)
original = p;
if(p.Find(".merge-right.r") >= 0)
theirs = p;
if(p.Find(".working") >= 0)
if(p.Find(".working") >= 0 || p.Find(".mine") >= 0)
mine = p;
try {
CParser q(GetFileExt(~p));
q.PassChar('.');
q.PassChar('r');
int n = q.ReadInt();
if(q.IsEof()) {
r.Add(p);
rn.Add(n);
}
}
catch(CParser::Error) {}
}
}
if(IsNull(original) && IsNull(theirs) && r.GetCount() == 2) {
original = r[0];
theirs = r[1];
if(rn[1] > rn[0])
Swap(original, theirs);
}
}
else {
bool a = false, b = false, c = false;
int n = min(editor.GetLineCount(), 10000);