Fossil SCM

Merge cleanX

jan.nijtmans 2017-08-30 13:28 UTC cleanX-no-clean-glob merge
Commit fd47eae7dac59df620dd0aed808a3eacbc7dc2f64f1ba2f61f202fb447921062
Parent 929761004797a77…
2 files changed +1 +1
~ src/checkin.c ~ src/checkin.c
M src/checkin.c
+1
--- src/checkin.c
+++ src/checkin.c
@@ -985,10 +985,11 @@
985985
 zKeepFlag = find_option("keep",0,1);
986986
 db_must_be_within_tree();
987987
 if( find_option("verily","x",0)!=0 ){
988988
 verilyFlag = 1;
989989
 emptyDirsFlag = 1;
990
+ allDirFlag = 1;
990991
 scanFlags |= SCAN_ALL;
991992
 }
992993
 if( zIgnoreFlag==0 ){
993994
 zIgnoreFlag = db_get("ignore-glob", 0);
994995
 }
995996
--- src/checkin.c
+++ src/checkin.c
@@ -985,10 +985,11 @@
985 zKeepFlag = find_option("keep",0,1);
986 db_must_be_within_tree();
987 if( find_option("verily","x",0)!=0 ){
988 verilyFlag = 1;
989 emptyDirsFlag = 1;
 
990 scanFlags |= SCAN_ALL;
991 }
992 if( zIgnoreFlag==0 ){
993 zIgnoreFlag = db_get("ignore-glob", 0);
994 }
995
--- src/checkin.c
+++ src/checkin.c
@@ -985,10 +985,11 @@
985 zKeepFlag = find_option("keep",0,1);
986 db_must_be_within_tree();
987 if( find_option("verily","x",0)!=0 ){
988 verilyFlag = 1;
989 emptyDirsFlag = 1;
990 allDirFlag = 1;
991 scanFlags |= SCAN_ALL;
992 }
993 if( zIgnoreFlag==0 ){
994 zIgnoreFlag = db_get("ignore-glob", 0);
995 }
996
M src/checkin.c
+1
--- src/checkin.c
+++ src/checkin.c
@@ -985,10 +985,11 @@
985985
 zKeepFlag = find_option("keep",0,1);
986986
 db_must_be_within_tree();
987987
 if( find_option("verily","x",0)!=0 ){
988988
 verilyFlag = 1;
989989
 emptyDirsFlag = 1;
990
+ allDirFlag = 1;
990991
 scanFlags |= SCAN_ALL;
991992
 }
992993
 if( zIgnoreFlag==0 ){
993994
 zIgnoreFlag = db_get("ignore-glob", 0);
994995
 }
995996
--- src/checkin.c
+++ src/checkin.c
@@ -985,10 +985,11 @@
985 zKeepFlag = find_option("keep",0,1);
986 db_must_be_within_tree();
987 if( find_option("verily","x",0)!=0 ){
988 verilyFlag = 1;
989 emptyDirsFlag = 1;
 
990 scanFlags |= SCAN_ALL;
991 }
992 if( zIgnoreFlag==0 ){
993 zIgnoreFlag = db_get("ignore-glob", 0);
994 }
995
--- src/checkin.c
+++ src/checkin.c
@@ -985,10 +985,11 @@
985 zKeepFlag = find_option("keep",0,1);
986 db_must_be_within_tree();
987 if( find_option("verily","x",0)!=0 ){
988 verilyFlag = 1;
989 emptyDirsFlag = 1;
990 allDirFlag = 1;
991 scanFlags |= SCAN_ALL;
992 }
993 if( zIgnoreFlag==0 ){
994 zIgnoreFlag = db_get("ignore-glob", 0);
995 }
996

Keyboard Shortcuts

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