Fossil SCM
Bring behavior and comments closer toghether, hopefully right this time.
Commit
cc34dcb747cd91bd61c76274930cd21fffdc7fe2
Parent
b3384326b3a3b52…
1 file changed
+3
-3
+3
-3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -646,12 +646,12 @@ | ||
| 646 | 646 | ** |
| 647 | 647 | ** The --verily option ignores the keep-glob and ignore-glob settings |
| 648 | 648 | ** and turns on --force, --dotfiles, and --emptydirs. Use the --verily |
| 649 | 649 | ** option when you really want to clean up everything. |
| 650 | 650 | ** |
| 651 | -** If a source tree is cleaned accidently, it can be restored using | |
| 652 | -** the "fossil undo" command, except when the -f|--force flag is used. | |
| 651 | +** If a source tree is cleaned accidentally, it can be restored using | |
| 652 | +** the "fossil undo" command, except for files matching ignore-glob. | |
| 653 | 653 | ** |
| 654 | 654 | ** Options: |
| 655 | 655 | ** --allckouts Check for empty directories within any checkouts |
| 656 | 656 | ** that may be nested within the current one. This |
| 657 | 657 | ** option should be used with great care because the |
| @@ -704,11 +704,11 @@ | ||
| 704 | 704 | } |
| 705 | 705 | if( !dryRunFlag ){ |
| 706 | 706 | dryRunFlag = find_option("whatif",0,0)!=0; |
| 707 | 707 | } |
| 708 | 708 | allFileFlag = allDirFlag = forceFlag = find_option("force","f",0)!=0; |
| 709 | - if( !forceFlag && !dryRunFlag ){ | |
| 709 | + if( !dryRunFlag ){ | |
| 710 | 710 | undo_capture_command_line(); |
| 711 | 711 | } |
| 712 | 712 | dirsOnlyFlag = find_option("dirsonly",0,0)!=0; |
| 713 | 713 | emptyDirsFlag = find_option("emptydirs","d",0)!=0 || dirsOnlyFlag; |
| 714 | 714 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; |
| 715 | 715 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -646,12 +646,12 @@ | |
| 646 | ** |
| 647 | ** The --verily option ignores the keep-glob and ignore-glob settings |
| 648 | ** and turns on --force, --dotfiles, and --emptydirs. Use the --verily |
| 649 | ** option when you really want to clean up everything. |
| 650 | ** |
| 651 | ** If a source tree is cleaned accidently, it can be restored using |
| 652 | ** the "fossil undo" command, except when the -f|--force flag is used. |
| 653 | ** |
| 654 | ** Options: |
| 655 | ** --allckouts Check for empty directories within any checkouts |
| 656 | ** that may be nested within the current one. This |
| 657 | ** option should be used with great care because the |
| @@ -704,11 +704,11 @@ | |
| 704 | } |
| 705 | if( !dryRunFlag ){ |
| 706 | dryRunFlag = find_option("whatif",0,0)!=0; |
| 707 | } |
| 708 | allFileFlag = allDirFlag = forceFlag = find_option("force","f",0)!=0; |
| 709 | if( !forceFlag && !dryRunFlag ){ |
| 710 | undo_capture_command_line(); |
| 711 | } |
| 712 | dirsOnlyFlag = find_option("dirsonly",0,0)!=0; |
| 713 | emptyDirsFlag = find_option("emptydirs","d",0)!=0 || dirsOnlyFlag; |
| 714 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; |
| 715 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -646,12 +646,12 @@ | |
| 646 | ** |
| 647 | ** The --verily option ignores the keep-glob and ignore-glob settings |
| 648 | ** and turns on --force, --dotfiles, and --emptydirs. Use the --verily |
| 649 | ** option when you really want to clean up everything. |
| 650 | ** |
| 651 | ** If a source tree is cleaned accidentally, it can be restored using |
| 652 | ** the "fossil undo" command, except for files matching ignore-glob. |
| 653 | ** |
| 654 | ** Options: |
| 655 | ** --allckouts Check for empty directories within any checkouts |
| 656 | ** that may be nested within the current one. This |
| 657 | ** option should be used with great care because the |
| @@ -704,11 +704,11 @@ | |
| 704 | } |
| 705 | if( !dryRunFlag ){ |
| 706 | dryRunFlag = find_option("whatif",0,0)!=0; |
| 707 | } |
| 708 | allFileFlag = allDirFlag = forceFlag = find_option("force","f",0)!=0; |
| 709 | if( !dryRunFlag ){ |
| 710 | undo_capture_command_line(); |
| 711 | } |
| 712 | dirsOnlyFlag = find_option("dirsonly",0,0)!=0; |
| 713 | emptyDirsFlag = find_option("emptydirs","d",0)!=0 || dirsOnlyFlag; |
| 714 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; |
| 715 |