[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/kioslave/svn/ksvnd
From:       Mickael Marchand <marchand () kde ! org>
Date:       2005-05-07 1:23:31
Message-ID: 1115429011.496752.22654.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 410219 by marchand:

fix update/commit not showing up



 M  +4 -3      trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp  


--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp #410218:410219
@@ -208,7 +208,7 @@
 		if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) \
) { // normal subdir known in the working copy  parentsentries++;
 		} else if ( isFolder( *it ) ) { // other subfolders (either another module \
                checkouted or an external, or something not known at all)
-			if ( QFile::exists( ( *it ).path() + "/.svn/entries/" ) ) 
+			if ( QFile::exists( ( *it ).path() + "/.svn/entries" ) ) 
 				subdirhavesvn++;
 			if ( isFileInExternals( (*it).filename(), ( *it ).directory() + "/.svn/dir-props" \
) ) {  external++;
@@ -293,8 +293,9 @@
 		result << "Checkout";
 	}
 	
-	if ( listStatus & AllParentsHaveSvn &&
-			( ( listStatus & SomeAreExternalToParent ) || ( listStatus & \
SomeAreInParentsEntries ) ) +	if ( ( listStatus & AllParentsHaveSvn &&
+			( ( listStatus & SomeAreExternalToParent ) || ( listStatus & \
SomeAreInParentsEntries ) )  +				|| ( listStatus & SomeHaveSvn ) )
 		) {
 		result << "Update";
 		result << "Commit";


[prev in list] [next in list] [prev in thread] [next in thread]