Fossil SCM
Removed a digression in the gitusers doc about Fossil's new clone-and-open mechanisms. That got moved to the ckout-workflows doc quite some time back, and we already point to it from that same section. There's no reason for the redundancy. Also cleaned up some grammar and typos while in there.
Commit
f43eaf01e3ef9ad4d648c23f68c9aa44ffc2173f137e97a82164e75847f468f9
Parent
72d820f32049135…
1 file changed
+7
-19
+7
-19
| --- www/gitusers.md | ||
| +++ www/gitusers.md | ||
| @@ -183,13 +183,13 @@ | ||
| 183 | 183 | git checkout foo-branch |
| 184 | 184 | |
| 185 | 185 | The symlink trick has a number of problems, the largest being that |
| 186 | 186 | symlinks weren’t available on Windows until Vista, and until the Windows |
| 187 | 187 | 10 Creators Update was released in spring of 2017, you had to be an |
| 188 | -Administrator to use the feature besides. ([Source][wsyml]) Git solved | |
| 188 | +Administrator to use the feature besides. ([Source][wsyml]) Git 2.5 solved | |
| 189 | 189 | this problem back when Windows XP was Microsoft’s current offering |
| 190 | -with the `git-worktree` command, added in Git 2.5: | |
| 190 | +by adding the `git-worktree` command: | |
| 191 | 191 | |
| 192 | 192 | git worktree add ../foo-branch foo-branch |
| 193 | 193 | cd ../foo-branch |
| 194 | 194 | |
| 195 | 195 | That is approximately equivalent to this in Fossil: |
| @@ -196,15 +196,15 @@ | ||
| 196 | 196 | |
| 197 | 197 | mkdir ../foo-branch |
| 198 | 198 | cd ../foo-branch |
| 199 | 199 | fossil open /path/to/repo.fossil foo-branch |
| 200 | 200 | |
| 201 | -The Fossil alternative is wordier, but this tends to be one-time setup, | |
| 202 | -not something you do everyday. This author keeps a “scratch” check-out | |
| 203 | -for cases where is isn’t appropriate to reuse the “trunk” check-out, | |
| 201 | +The Fossil alternative is wordier, but since this tends to be one-time setup, | |
| 202 | +not something you do everyday, the overhead is insignificant. This author keeps a “scratch” check-out | |
| 203 | +for cases where it’s inappropriate to reuse the “trunk” check-out, | |
| 204 | 204 | isolating all of my expedient switch-in-place actions to that one |
| 205 | -working directory. Since the other peer check-out track long-lived | |
| 205 | +working directory. Since the other peer check-outs track long-lived | |
| 206 | 206 | branches, and that set rarely changes once a development machine is set |
| 207 | 207 | up, I rarely pay the cost of these wordier commands. |
| 208 | 208 | |
| 209 | 209 | That then leads us to the closest equivalent in Git to [closing a Fossil |
| 210 | 210 | check-out](#close): |
| @@ -222,27 +222,15 @@ | ||
| 222 | 222 | |
| 223 | 223 | This allows you to have your Git repository directory entirely separate |
| 224 | 224 | from your working tree, with `.git` in the check-out directory being a |
| 225 | 225 | file that points to `../repo.git`, in this example. |
| 226 | 226 | |
| 227 | -As of Fossil 2.14, there is a direct equivalent: | |
| 228 | - | |
| 229 | - fossil clone https://example.com/repo | |
| 230 | - | |
| 231 | -It’s a shorter command because we deduce `repo.fossil` and the `repo/` | |
| 232 | -working directory from the last element of the path in the URI. If you | |
| 233 | -wanted to override both deductions, you’d say: | |
| 234 | - | |
| 235 | - fossil clone --workdir foo https://example.com/repo/bar | |
| 236 | - | |
| 237 | -That gets you `bar.fossil` with a `foo/` working directory alongside it. | |
| 238 | - | |
| 239 | 227 | [mcw]: ./ckout-workflows.md#mcw |
| 240 | 228 | [wsyml]: https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/ |
| 241 | 229 | |
| 242 | 230 | |
| 243 | -#### <a id="iip"></a> Init In Place | |
| 231 | +#### <a id="iip"></a> Init in Place | |
| 244 | 232 | |
| 245 | 233 | To illustrate the differences that Fossil’s separation of repository |
| 246 | 234 | from working directory creates in practice, consider this common Git “init in place” |
| 247 | 235 | method for creating a new repository from an existing tree of files, |
| 248 | 236 | perhaps because you are placing that project under version control for |
| 249 | 237 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -183,13 +183,13 @@ | |
| 183 | git checkout foo-branch |
| 184 | |
| 185 | The symlink trick has a number of problems, the largest being that |
| 186 | symlinks weren’t available on Windows until Vista, and until the Windows |
| 187 | 10 Creators Update was released in spring of 2017, you had to be an |
| 188 | Administrator to use the feature besides. ([Source][wsyml]) Git solved |
| 189 | this problem back when Windows XP was Microsoft’s current offering |
| 190 | with the `git-worktree` command, added in Git 2.5: |
| 191 | |
| 192 | git worktree add ../foo-branch foo-branch |
| 193 | cd ../foo-branch |
| 194 | |
| 195 | That is approximately equivalent to this in Fossil: |
| @@ -196,15 +196,15 @@ | |
| 196 | |
| 197 | mkdir ../foo-branch |
| 198 | cd ../foo-branch |
| 199 | fossil open /path/to/repo.fossil foo-branch |
| 200 | |
| 201 | The Fossil alternative is wordier, but this tends to be one-time setup, |
| 202 | not something you do everyday. This author keeps a “scratch” check-out |
| 203 | for cases where is isn’t appropriate to reuse the “trunk” check-out, |
| 204 | isolating all of my expedient switch-in-place actions to that one |
| 205 | working directory. Since the other peer check-out track long-lived |
| 206 | branches, and that set rarely changes once a development machine is set |
| 207 | up, I rarely pay the cost of these wordier commands. |
| 208 | |
| 209 | That then leads us to the closest equivalent in Git to [closing a Fossil |
| 210 | check-out](#close): |
| @@ -222,27 +222,15 @@ | |
| 222 | |
| 223 | This allows you to have your Git repository directory entirely separate |
| 224 | from your working tree, with `.git` in the check-out directory being a |
| 225 | file that points to `../repo.git`, in this example. |
| 226 | |
| 227 | As of Fossil 2.14, there is a direct equivalent: |
| 228 | |
| 229 | fossil clone https://example.com/repo |
| 230 | |
| 231 | It’s a shorter command because we deduce `repo.fossil` and the `repo/` |
| 232 | working directory from the last element of the path in the URI. If you |
| 233 | wanted to override both deductions, you’d say: |
| 234 | |
| 235 | fossil clone --workdir foo https://example.com/repo/bar |
| 236 | |
| 237 | That gets you `bar.fossil` with a `foo/` working directory alongside it. |
| 238 | |
| 239 | [mcw]: ./ckout-workflows.md#mcw |
| 240 | [wsyml]: https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/ |
| 241 | |
| 242 | |
| 243 | #### <a id="iip"></a> Init In Place |
| 244 | |
| 245 | To illustrate the differences that Fossil’s separation of repository |
| 246 | from working directory creates in practice, consider this common Git “init in place” |
| 247 | method for creating a new repository from an existing tree of files, |
| 248 | perhaps because you are placing that project under version control for |
| 249 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -183,13 +183,13 @@ | |
| 183 | git checkout foo-branch |
| 184 | |
| 185 | The symlink trick has a number of problems, the largest being that |
| 186 | symlinks weren’t available on Windows until Vista, and until the Windows |
| 187 | 10 Creators Update was released in spring of 2017, you had to be an |
| 188 | Administrator to use the feature besides. ([Source][wsyml]) Git 2.5 solved |
| 189 | this problem back when Windows XP was Microsoft’s current offering |
| 190 | by adding the `git-worktree` command: |
| 191 | |
| 192 | git worktree add ../foo-branch foo-branch |
| 193 | cd ../foo-branch |
| 194 | |
| 195 | That is approximately equivalent to this in Fossil: |
| @@ -196,15 +196,15 @@ | |
| 196 | |
| 197 | mkdir ../foo-branch |
| 198 | cd ../foo-branch |
| 199 | fossil open /path/to/repo.fossil foo-branch |
| 200 | |
| 201 | The Fossil alternative is wordier, but since this tends to be one-time setup, |
| 202 | not something you do everyday, the overhead is insignificant. This author keeps a “scratch” check-out |
| 203 | for cases where it’s inappropriate to reuse the “trunk” check-out, |
| 204 | isolating all of my expedient switch-in-place actions to that one |
| 205 | working directory. Since the other peer check-outs track long-lived |
| 206 | branches, and that set rarely changes once a development machine is set |
| 207 | up, I rarely pay the cost of these wordier commands. |
| 208 | |
| 209 | That then leads us to the closest equivalent in Git to [closing a Fossil |
| 210 | check-out](#close): |
| @@ -222,27 +222,15 @@ | |
| 222 | |
| 223 | This allows you to have your Git repository directory entirely separate |
| 224 | from your working tree, with `.git` in the check-out directory being a |
| 225 | file that points to `../repo.git`, in this example. |
| 226 | |
| 227 | [mcw]: ./ckout-workflows.md#mcw |
| 228 | [wsyml]: https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/ |
| 229 | |
| 230 | |
| 231 | #### <a id="iip"></a> Init in Place |
| 232 | |
| 233 | To illustrate the differences that Fossil’s separation of repository |
| 234 | from working directory creates in practice, consider this common Git “init in place” |
| 235 | method for creating a new repository from an existing tree of files, |
| 236 | perhaps because you are placing that project under version control for |
| 237 |