Fossil SCM

Merged with trunk.

sdr 2014-09-20 15:28 bad-winsymlink merge
Commit e2c5960617f2c9d1b10386e7bf945db8f06c4479
Parent de8035cca6ebd69…
4 files changed -2 -2 -1 -1
~ src/checkin.c ~ src/checkin.c ~ src/file.c ~ src/file.c
M src/checkin.c
-2
--- src/checkin.c
+++ src/checkin.c
@@ -473,11 +473,10 @@
473473
 Glob *pIgnore;
474474
 Blob rewrittenPathname;
475475
 const char *zPathname, *zDisplayName;
476476
477477
 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
478
- capture_case_sensitive_option();
479478
 db_must_be_within_tree();
480479
 cwdRelative = determine_cwd_relative_option();
481480
482481
 /* We should be done with options.. */
483482
 verify_all_options();
@@ -596,11 +595,10 @@
596595
 if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED;
597596
 zIgnoreFlag = find_option("ignore",0,1);
598597
 verboseFlag = find_option("verbose","v",0)!=0;
599598
 zKeepFlag = find_option("keep",0,1);
600599
 zCleanFlag = find_option("clean",0,1);
601
- capture_case_sensitive_option();
602600
 db_must_be_within_tree();
603601
 if( zIgnoreFlag==0 ){
604602
 zIgnoreFlag = db_get("ignore-glob", 0);
605603
 }
606604
 if( zKeepFlag==0 ){
607605
--- src/checkin.c
+++ src/checkin.c
@@ -473,11 +473,10 @@
473 Glob *pIgnore;
474 Blob rewrittenPathname;
475 const char *zPathname, *zDisplayName;
476
477 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
478 capture_case_sensitive_option();
479 db_must_be_within_tree();
480 cwdRelative = determine_cwd_relative_option();
481
482 /* We should be done with options.. */
483 verify_all_options();
@@ -596,11 +595,10 @@
596 if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED;
597 zIgnoreFlag = find_option("ignore",0,1);
598 verboseFlag = find_option("verbose","v",0)!=0;
599 zKeepFlag = find_option("keep",0,1);
600 zCleanFlag = find_option("clean",0,1);
601 capture_case_sensitive_option();
602 db_must_be_within_tree();
603 if( zIgnoreFlag==0 ){
604 zIgnoreFlag = db_get("ignore-glob", 0);
605 }
606 if( zKeepFlag==0 ){
607
--- src/checkin.c
+++ src/checkin.c
@@ -473,11 +473,10 @@
473 Glob *pIgnore;
474 Blob rewrittenPathname;
475 const char *zPathname, *zDisplayName;
476
477 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
 
478 db_must_be_within_tree();
479 cwdRelative = determine_cwd_relative_option();
480
481 /* We should be done with options.. */
482 verify_all_options();
@@ -596,11 +595,10 @@
595 if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED;
596 zIgnoreFlag = find_option("ignore",0,1);
597 verboseFlag = find_option("verbose","v",0)!=0;
598 zKeepFlag = find_option("keep",0,1);
599 zCleanFlag = find_option("clean",0,1);
 
600 db_must_be_within_tree();
601 if( zIgnoreFlag==0 ){
602 zIgnoreFlag = db_get("ignore-glob", 0);
603 }
604 if( zKeepFlag==0 ){
605
M src/checkin.c
-2
--- src/checkin.c
+++ src/checkin.c
@@ -473,11 +473,10 @@
473473
 Glob *pIgnore;
474474
 Blob rewrittenPathname;
475475
 const char *zPathname, *zDisplayName;
476476
477477
 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
478
- capture_case_sensitive_option();
479478
 db_must_be_within_tree();
480479
 cwdRelative = determine_cwd_relative_option();
481480
482481
 /* We should be done with options.. */
483482
 verify_all_options();
@@ -596,11 +595,10 @@
596595
 if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED;
597596
 zIgnoreFlag = find_option("ignore",0,1);
598597
 verboseFlag = find_option("verbose","v",0)!=0;
599598
 zKeepFlag = find_option("keep",0,1);
600599
 zCleanFlag = find_option("clean",0,1);
601
- capture_case_sensitive_option();
602600
 db_must_be_within_tree();
603601
 if( zIgnoreFlag==0 ){
604602
 zIgnoreFlag = db_get("ignore-glob", 0);
605603
 }
606604
 if( zKeepFlag==0 ){
607605
--- src/checkin.c
+++ src/checkin.c
@@ -473,11 +473,10 @@
473 Glob *pIgnore;
474 Blob rewrittenPathname;
475 const char *zPathname, *zDisplayName;
476
477 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
478 capture_case_sensitive_option();
479 db_must_be_within_tree();
480 cwdRelative = determine_cwd_relative_option();
481
482 /* We should be done with options.. */
483 verify_all_options();
@@ -596,11 +595,10 @@
596 if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED;
597 zIgnoreFlag = find_option("ignore",0,1);
598 verboseFlag = find_option("verbose","v",0)!=0;
599 zKeepFlag = find_option("keep",0,1);
600 zCleanFlag = find_option("clean",0,1);
601 capture_case_sensitive_option();
602 db_must_be_within_tree();
603 if( zIgnoreFlag==0 ){
604 zIgnoreFlag = db_get("ignore-glob", 0);
605 }
606 if( zKeepFlag==0 ){
607
--- src/checkin.c
+++ src/checkin.c
@@ -473,11 +473,10 @@
473 Glob *pIgnore;
474 Blob rewrittenPathname;
475 const char *zPathname, *zDisplayName;
476
477 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
 
478 db_must_be_within_tree();
479 cwdRelative = determine_cwd_relative_option();
480
481 /* We should be done with options.. */
482 verify_all_options();
@@ -596,11 +595,10 @@
595 if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED;
596 zIgnoreFlag = find_option("ignore",0,1);
597 verboseFlag = find_option("verbose","v",0)!=0;
598 zKeepFlag = find_option("keep",0,1);
599 zCleanFlag = find_option("clean",0,1);
 
600 db_must_be_within_tree();
601 if( zIgnoreFlag==0 ){
602 zIgnoreFlag = db_get("ignore-glob", 0);
603 }
604 if( zKeepFlag==0 ){
605
M src/file.c
-1
--- src/file.c
+++ src/file.c
@@ -1110,11 +1110,10 @@
11101110
 void cmd_test_tree_name(void){
11111111
 int i;
11121112
 Blob x;
11131113
 db_find_and_open_repository(0,0);
11141114
 blob_zero(&x);
1115
- capture_case_sensitive_option();
11161115
 for(i=2; i<g.argc; i++){
11171116
 if( file_tree_name(g.argv[i], &x, 1) ){
11181117
 fossil_print("%s\n", blob_buffer(&x));
11191118
 blob_reset(&x);
11201119
 }
11211120
--- src/file.c
+++ src/file.c
@@ -1110,11 +1110,10 @@
1110 void cmd_test_tree_name(void){
1111 int i;
1112 Blob x;
1113 db_find_and_open_repository(0,0);
1114 blob_zero(&x);
1115 capture_case_sensitive_option();
1116 for(i=2; i<g.argc; i++){
1117 if( file_tree_name(g.argv[i], &x, 1) ){
1118 fossil_print("%s\n", blob_buffer(&x));
1119 blob_reset(&x);
1120 }
1121
--- src/file.c
+++ src/file.c
@@ -1110,11 +1110,10 @@
1110 void cmd_test_tree_name(void){
1111 int i;
1112 Blob x;
1113 db_find_and_open_repository(0,0);
1114 blob_zero(&x);
 
1115 for(i=2; i<g.argc; i++){
1116 if( file_tree_name(g.argv[i], &x, 1) ){
1117 fossil_print("%s\n", blob_buffer(&x));
1118 blob_reset(&x);
1119 }
1120
M src/file.c
-1
--- src/file.c
+++ src/file.c
@@ -1110,11 +1110,10 @@
11101110
 void cmd_test_tree_name(void){
11111111
 int i;
11121112
 Blob x;
11131113
 db_find_and_open_repository(0,0);
11141114
 blob_zero(&x);
1115
- capture_case_sensitive_option();
11161115
 for(i=2; i<g.argc; i++){
11171116
 if( file_tree_name(g.argv[i], &x, 1) ){
11181117
 fossil_print("%s\n", blob_buffer(&x));
11191118
 blob_reset(&x);
11201119
 }
11211120
--- src/file.c
+++ src/file.c
@@ -1110,11 +1110,10 @@
1110 void cmd_test_tree_name(void){
1111 int i;
1112 Blob x;
1113 db_find_and_open_repository(0,0);
1114 blob_zero(&x);
1115 capture_case_sensitive_option();
1116 for(i=2; i<g.argc; i++){
1117 if( file_tree_name(g.argv[i], &x, 1) ){
1118 fossil_print("%s\n", blob_buffer(&x));
1119 blob_reset(&x);
1120 }
1121
--- src/file.c
+++ src/file.c
@@ -1110,11 +1110,10 @@
1110 void cmd_test_tree_name(void){
1111 int i;
1112 Blob x;
1113 db_find_and_open_repository(0,0);
1114 blob_zero(&x);
 
1115 for(i=2; i<g.argc; i++){
1116 if( file_tree_name(g.argv[i], &x, 1) ){
1117 fossil_print("%s\n", blob_buffer(&x));
1118 blob_reset(&x);
1119 }
1120

Keyboard Shortcuts

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