From 24fef42f2fca69764929837ecf4afafad8a3944d Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 28 Jan 2012 10:33:50 +0000
Subject: [PATCH] *ide: Fixed conflict and 'svn add' issues in usvn

git-svn-id: svn://ultimatepp.org/upp/trunk@4480 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/usvn/SvnSync.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/uppsrc/usvn/SvnSync.cpp b/uppsrc/usvn/SvnSync.cpp
index 6f73cf526..416fb4333 100644
--- a/uppsrc/usvn/SvnSync.cpp
+++ b/uppsrc/usvn/SvnSync.cpp
@@ -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;