Fossil SCM

fix Abandoning warning

jan.nijtmans 2012-11-07 10:14 improve_commit_warning
Commit 4d6ae5c0072ea8a429ed95f961a870bbc5be814f
1 file changed +1 -1
+1 -1
--- src/checkin.c
+++ src/checkin.c
@@ -926,11 +926,11 @@
926926
prompt_user(zMsg, &ans);
927927
fossil_free(zMsg);
928928
cReply = blob_str(&ans)[0];
929929
if( cReply!='y' && cReply!='Y' ){
930930
fossil_fatal("Abandoning commit due to %s in %s",
931
- blob_str(&fname), zWarning);
931
+ zWarning, blob_str(&fname));
932932
}
933933
blob_reset(&ans);
934934
eType +=4 ;
935935
}
936936
if( eType==0 || eType==-1 || fUnicode ){
937937
--- src/checkin.c
+++ src/checkin.c
@@ -926,11 +926,11 @@
926 prompt_user(zMsg, &ans);
927 fossil_free(zMsg);
928 cReply = blob_str(&ans)[0];
929 if( cReply!='y' && cReply!='Y' ){
930 fossil_fatal("Abandoning commit due to %s in %s",
931 blob_str(&fname), zWarning);
932 }
933 blob_reset(&ans);
934 eType +=4 ;
935 }
936 if( eType==0 || eType==-1 || fUnicode ){
937
--- src/checkin.c
+++ src/checkin.c
@@ -926,11 +926,11 @@
926 prompt_user(zMsg, &ans);
927 fossil_free(zMsg);
928 cReply = blob_str(&ans)[0];
929 if( cReply!='y' && cReply!='Y' ){
930 fossil_fatal("Abandoning commit due to %s in %s",
931 zWarning, blob_str(&fname));
932 }
933 blob_reset(&ans);
934 eType +=4 ;
935 }
936 if( eType==0 || eType==-1 || fUnicode ){
937

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button