commitmonitor Code

Monitor your SVN repositories and notifies you on new commits

Brought to you by: steveking

Commit [r450] Maximize Restore History

if an entry already exists, do not replace it on importing (which would lose all log entries too) but only overwrite the config data.

Authored by: tortoisesvn 2009-08-24

Browse code at this revision

Parent: [r449]

Child: [r451]

changed

/trunk/src/UrlInfo.cpp

/trunk/src/UrlInfo.cpp Diff Switch to side-by-side view

--- a/trunk/src/UrlInfo.cpp
+++ b/trunk/src/UrlInfo.cpp
@@ -575,7 +575,25 @@
 			info.password = plainPw;
 		}
 
-		infos[info.url] = info;
+		if ((infos.size())&&(infos.find(info.url) != infos.end()))
+		{
+			CUrlInfo existingUrlInfo = infos.find(info.url)->second;
+			existingUrlInfo.username = info.username;
+			existingUrlInfo.url = info.url;
+			existingUrlInfo.name = info.name;
+			existingUrlInfo.ignoreUsers = info.ignoreUsers;
+			existingUrlInfo.callcommand = info.callcommand;
+			existingUrlInfo.webviewer = info.webviewer;
+			existingUrlInfo.minutesinterval = info.minutesinterval;
+			existingUrlInfo.minminutesinterval = info.minminutesinterval;
+			existingUrlInfo.disallowdiffs = info.disallowdiffs;
+			existingUrlInfo.maxentries = info.maxentries;
+			existingUrlInfo.noexecuteignored = info.noexecuteignored;
+
+			infos[existingUrlInfo.url] = existingUrlInfo;
+		}
+		else
+			infos[info.url] = info;
 	}