Fossil SCM
Reworded misleading statements in the "touch" help.
Commit
ad275f975c3c4c04ec6f9ae4f4c5882383ff8034ffc91ef7d00eb5938172ea5a
Parent
1b49ab3c6c414a2…
1 file changed
+7
-7
+7
-7
| --- src/file.c | ||
| +++ src/file.c | ||
| @@ -1882,12 +1882,11 @@ | ||
| 1882 | 1882 | ** This is the default behavior. |
| 1883 | 1883 | ** -c|--checkin Stamp each affected file with the time of the |
| 1884 | 1884 | ** most recent check-in which modified that file. |
| 1885 | 1885 | ** -C|--checkout Stamp each affected file with the time of the |
| 1886 | 1886 | ** currently-checked-out version. |
| 1887 | -** -g GLOBLIST Comma-separated list of glob patterns. Default | |
| 1888 | -** is to touch all SCM-controlled files. | |
| 1887 | +** -g GLOBLIST Comma-separated list of glob patterns. | |
| 1889 | 1888 | ** -G GLOBFILE Similar to -g but reads its globs from a |
| 1890 | 1889 | ** fossil-conventional glob list file. |
| 1891 | 1890 | ** -v|-verbose Outputs extra information about its globs |
| 1892 | 1891 | ** and each file it touches. |
| 1893 | 1892 | ** -n|--dry-run Outputs which files would require touching, |
| @@ -1898,15 +1897,16 @@ | ||
| 1898 | 1897 | ** Only one of --now, --checkin, and --checkout may be used. The |
| 1899 | 1898 | ** default is --now. |
| 1900 | 1899 | ** |
| 1901 | 1900 | ** Only one of -g or -G may be used. If neither is provided and no |
| 1902 | 1901 | ** additional filenames are provided, the effect is as if a glob of |
| 1903 | -** '*' were provided. Note that all glob patterns provided via these | |
| 1904 | -** flags are always evaluated as if they are relative to the top of | |
| 1905 | -** the source tree, not the current working (sub)directory. Filenames | |
| 1906 | -** provided without these flags, on the other hand, are treated as | |
| 1907 | -** relative to the current directory. | |
| 1902 | +** '*' were provided, i.e. all files belonging to the | |
| 1903 | +** currently-checked-out version. Note that all glob patterns provided | |
| 1904 | +** via these flags are always evaluated as if they are relative to the | |
| 1905 | +** top of the source tree, not the current working (sub)directory. | |
| 1906 | +** Filenames provided without these flags, on the other hand, are | |
| 1907 | +** treated as relative to the current directory. | |
| 1908 | 1908 | ** |
| 1909 | 1909 | */ |
| 1910 | 1910 | void touch_cmd(){ |
| 1911 | 1911 | const char * zGlobList; /* -g List of glob patterns */ |
| 1912 | 1912 | const char * zGlobFile; /* -G File of glob patterns */ |
| 1913 | 1913 |
| --- src/file.c | |
| +++ src/file.c | |
| @@ -1882,12 +1882,11 @@ | |
| 1882 | ** This is the default behavior. |
| 1883 | ** -c|--checkin Stamp each affected file with the time of the |
| 1884 | ** most recent check-in which modified that file. |
| 1885 | ** -C|--checkout Stamp each affected file with the time of the |
| 1886 | ** currently-checked-out version. |
| 1887 | ** -g GLOBLIST Comma-separated list of glob patterns. Default |
| 1888 | ** is to touch all SCM-controlled files. |
| 1889 | ** -G GLOBFILE Similar to -g but reads its globs from a |
| 1890 | ** fossil-conventional glob list file. |
| 1891 | ** -v|-verbose Outputs extra information about its globs |
| 1892 | ** and each file it touches. |
| 1893 | ** -n|--dry-run Outputs which files would require touching, |
| @@ -1898,15 +1897,16 @@ | |
| 1898 | ** Only one of --now, --checkin, and --checkout may be used. The |
| 1899 | ** default is --now. |
| 1900 | ** |
| 1901 | ** Only one of -g or -G may be used. If neither is provided and no |
| 1902 | ** additional filenames are provided, the effect is as if a glob of |
| 1903 | ** '*' were provided. Note that all glob patterns provided via these |
| 1904 | ** flags are always evaluated as if they are relative to the top of |
| 1905 | ** the source tree, not the current working (sub)directory. Filenames |
| 1906 | ** provided without these flags, on the other hand, are treated as |
| 1907 | ** relative to the current directory. |
| 1908 | ** |
| 1909 | */ |
| 1910 | void touch_cmd(){ |
| 1911 | const char * zGlobList; /* -g List of glob patterns */ |
| 1912 | const char * zGlobFile; /* -G File of glob patterns */ |
| 1913 |
| --- src/file.c | |
| +++ src/file.c | |
| @@ -1882,12 +1882,11 @@ | |
| 1882 | ** This is the default behavior. |
| 1883 | ** -c|--checkin Stamp each affected file with the time of the |
| 1884 | ** most recent check-in which modified that file. |
| 1885 | ** -C|--checkout Stamp each affected file with the time of the |
| 1886 | ** currently-checked-out version. |
| 1887 | ** -g GLOBLIST Comma-separated list of glob patterns. |
| 1888 | ** -G GLOBFILE Similar to -g but reads its globs from a |
| 1889 | ** fossil-conventional glob list file. |
| 1890 | ** -v|-verbose Outputs extra information about its globs |
| 1891 | ** and each file it touches. |
| 1892 | ** -n|--dry-run Outputs which files would require touching, |
| @@ -1898,15 +1897,16 @@ | |
| 1897 | ** Only one of --now, --checkin, and --checkout may be used. The |
| 1898 | ** default is --now. |
| 1899 | ** |
| 1900 | ** Only one of -g or -G may be used. If neither is provided and no |
| 1901 | ** additional filenames are provided, the effect is as if a glob of |
| 1902 | ** '*' were provided, i.e. all files belonging to the |
| 1903 | ** currently-checked-out version. Note that all glob patterns provided |
| 1904 | ** via these flags are always evaluated as if they are relative to the |
| 1905 | ** top of the source tree, not the current working (sub)directory. |
| 1906 | ** Filenames provided without these flags, on the other hand, are |
| 1907 | ** treated as relative to the current directory. |
| 1908 | ** |
| 1909 | */ |
| 1910 | void touch_cmd(){ |
| 1911 | const char * zGlobList; /* -g List of glob patterns */ |
| 1912 | const char * zGlobFile; /* -G File of glob patterns */ |
| 1913 |