Fossil SCM
Update to the Hints For Git Users document, based on anonymous suggestions from the forum.
Commit
1f95ef532d31c68d77a0a249bdd183e8754b52a9bbf9a73986ea43b0c7a2e14d
Parent
a3c5ce63cf3b428…
1 file changed
+9
-5
+9
-5
| --- www/gitusers.md | ||
| +++ www/gitusers.md | ||
| @@ -162,11 +162,11 @@ | ||
| 162 | 162 | Maybe we will add multiple origin support to Fossil someday. Patches |
| 163 | 163 | are welcomed if you want to have a go at it. |
| 164 | 164 | |
| 165 | 165 | ## Cherry-pick Is An Option To The "merge" Command |
| 166 | 166 | |
| 167 | -In Git, "`git cherrypick`" is a separate command. | |
| 167 | +In Git, "`git cherry-pick`" is a separate command. | |
| 168 | 168 | In Fossil, "`fossil merge --cherrypick`" is an option on the merge |
| 169 | 169 | command. Otherwise, they work mostly the same. |
| 170 | 170 | |
| 171 | 171 | Except, the Fossil file format remembers cherrypicks and actually |
| 172 | 172 | shows them as dashed lines on the graphical DAG display, whereas |
| @@ -174,12 +174,16 @@ | ||
| 174 | 174 | format, so you have to talk about the cherry-pick in the commit |
| 175 | 175 | comment if you want to remember it. |
| 176 | 176 | |
| 177 | 177 | ## The "`fossil mv`" and "`fossil rm`" Commands Do Not Actually Rename Or Delete The Files (by default) |
| 178 | 178 | |
| 179 | -The "`fossil mv`" and "`fossil rm`" commands work like they do in CVS in | |
| 179 | +By default, | |
| 180 | +the "`fossil mv`" and "`fossil rm`" commands work like they do in CVS in | |
| 180 | 181 | that they schedule the changes for the next commit, but do not actually |
| 181 | -rename or delete the files in your check-out. You have to add the "--hard" | |
| 182 | +rename or delete the files in your check-out. You can to add the "--hard" | |
| 182 | 183 | option to also changes the files in your check-out. |
| 184 | +If you run | |
| 185 | + | |
| 186 | + fossil setting --global mv-rm-files 1 | |
| 183 | 187 | |
| 184 | -Yes, this is goofy. It needs to be changed. Unfortunately there are | |
| 185 | -script compatibility issues to consider. | |
| 188 | +it makes a notation in your per-user "~/.fossil" settings file so that | |
| 189 | +the "--hard" behavior becomes the new default. | |
| 186 | 190 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -162,11 +162,11 @@ | |
| 162 | Maybe we will add multiple origin support to Fossil someday. Patches |
| 163 | are welcomed if you want to have a go at it. |
| 164 | |
| 165 | ## Cherry-pick Is An Option To The "merge" Command |
| 166 | |
| 167 | In Git, "`git cherrypick`" is a separate command. |
| 168 | In Fossil, "`fossil merge --cherrypick`" is an option on the merge |
| 169 | command. Otherwise, they work mostly the same. |
| 170 | |
| 171 | Except, the Fossil file format remembers cherrypicks and actually |
| 172 | shows them as dashed lines on the graphical DAG display, whereas |
| @@ -174,12 +174,16 @@ | |
| 174 | format, so you have to talk about the cherry-pick in the commit |
| 175 | comment if you want to remember it. |
| 176 | |
| 177 | ## The "`fossil mv`" and "`fossil rm`" Commands Do Not Actually Rename Or Delete The Files (by default) |
| 178 | |
| 179 | The "`fossil mv`" and "`fossil rm`" commands work like they do in CVS in |
| 180 | that they schedule the changes for the next commit, but do not actually |
| 181 | rename or delete the files in your check-out. You have to add the "--hard" |
| 182 | option to also changes the files in your check-out. |
| 183 | |
| 184 | Yes, this is goofy. It needs to be changed. Unfortunately there are |
| 185 | script compatibility issues to consider. |
| 186 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -162,11 +162,11 @@ | |
| 162 | Maybe we will add multiple origin support to Fossil someday. Patches |
| 163 | are welcomed if you want to have a go at it. |
| 164 | |
| 165 | ## Cherry-pick Is An Option To The "merge" Command |
| 166 | |
| 167 | In Git, "`git cherry-pick`" is a separate command. |
| 168 | In Fossil, "`fossil merge --cherrypick`" is an option on the merge |
| 169 | command. Otherwise, they work mostly the same. |
| 170 | |
| 171 | Except, the Fossil file format remembers cherrypicks and actually |
| 172 | shows them as dashed lines on the graphical DAG display, whereas |
| @@ -174,12 +174,16 @@ | |
| 174 | format, so you have to talk about the cherry-pick in the commit |
| 175 | comment if you want to remember it. |
| 176 | |
| 177 | ## The "`fossil mv`" and "`fossil rm`" Commands Do Not Actually Rename Or Delete The Files (by default) |
| 178 | |
| 179 | By default, |
| 180 | the "`fossil mv`" and "`fossil rm`" commands work like they do in CVS in |
| 181 | that they schedule the changes for the next commit, but do not actually |
| 182 | rename or delete the files in your check-out. You can to add the "--hard" |
| 183 | option to also changes the files in your check-out. |
| 184 | If you run |
| 185 | |
| 186 | fossil setting --global mv-rm-files 1 |
| 187 | |
| 188 | it makes a notation in your per-user "~/.fossil" settings file so that |
| 189 | the "--hard" behavior becomes the new default. |
| 190 |