From 00524c51c2d756907ee83fc01dce4569f4f7ec9d Mon Sep 17 00:00:00 2001 From: rylek Date: Sat, 28 Mar 2009 18:23:42 +0000 Subject: [PATCH] git-svn-id: svn://ultimatepp.org/upp/trunk@1016 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/version.h | 2 +- uppsrc/usvn/SvnSync.cpp | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/uppsrc/ide/version.h b/uppsrc/ide/version.h index 7f7c54b93..a41d3b463 100644 --- a/uppsrc/ide/version.h +++ b/uppsrc/ide/version.h @@ -1 +1 @@ -#define IDE_VERSION "902r185" +#define IDE_VERSION "902r186" diff --git a/uppsrc/usvn/SvnSync.cpp b/uppsrc/usvn/SvnSync.cpp index 7e9c684f2..4454a7a11 100644 --- a/uppsrc/usvn/SvnSync.cpp +++ b/uppsrc/usvn/SvnSync.cpp @@ -219,12 +219,18 @@ again: msgmap.GetAdd(works[repoi++].working) = list.Get(i, 3); return; } - for(int i = 0; i < list.GetCount(); i++) - if(list.Get(i, 0) == MESSAGE && IsNull(list.Get(i, 3))) { - if(PromptYesNo("Commit message is empty.&Do you want to continue?")) - break; - goto again; + bool changes = false; + for(int i = 0; i < list.GetCount(); i++) { + int action = list.Get(i, 0); + if(action == MESSAGE) { + if(changes && IsNull(list.Get(i, 3)) + && !PromptYesNo("Commit message is empty.&Do you want to continue?")) + goto again; + changes = false; } + else if(action != MODIFY && action != REPOSITORY) + changes = true; + } SysConsole sys; int repoi = 0; int l = 0;