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: Fixed conflict and 'svn add' issues in usvn

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4480 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-01-28 10:33:50 +00:00
parent 0f6b4d081e
commit 24fef42f2f
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/usvn/SvnSync.cpp
View file

@ -48,7 +48,6 @@ void SvnSync::SyncList()
for(int i = 0; i < works.GetCount(); i++) {
SvnWork w = works[i];
String path = GetFullPath(w.working);
DDUMP(path);
list.Add(REPOSITORY, path,
AttrText("Working directory").SetFont(StdFont().Bold()).Ink(White).Paper(Blue),
AttrText(path).SetFont(Arial(20).Bold()).Paper(Blue).Ink(White),
@ -61,9 +60,6 @@ void SvnSync::SyncList()
String h = ln[i];
if(h.GetCount() > 7) {
String file = GetFullPath(TrimLeft(h.Mid(7)));
DLOG("------------------------------------------------");
DDUMP(h);
DDUMP(file);
if(IsFullPath(file)) {
actions = true;
h.Trim(7);
@ -107,8 +103,6 @@ void SvnSync::SyncList()
color = c[action];
}
}
DDUMP(an);
DDUMP(action);
if(pass == action < 0) {
int ii = list.GetCount();
list.Add(action, file,
@ -312,8 +306,6 @@ again:
continue;
}
else {
DDUMP(path);
LOGHEXDUMP(path, path.GetCount());
if(action != DELETEC)
filelist << " \"" << path << "\""; // <-- add the file to the list
commit = true;