Fossil SCM

Add example of fossil timeline + diff to get changes between specific versions

danshearer 2021-03-28 05:14 trunk
Commit 19f4b064ac4c3455141b73db24c65e6bf33697c5da01eb457ef4eca5be8bf7f9
1 file changed +26
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -242,10 +242,36 @@
242242
</blockquote>
243243
244244
<p>"fossil diff" is the difference between your tree on disk now and as the tree was
245245
when you did "fossil open". An open is the first checkout from a repository
246246
into a new directory. </p>
247
+
248
+<p>To see the most recent changes made to the repository by other users, use "fossil timeline" to
249
+find out the most recent commit, and then "fossil diff" between that commit and the
250
+current tree: </p>
251
+<blockquote>
252
+<b>
253
+ fossil timeline <br><tt>
254
+ === 2021-03-28 === <br>
255
+ 03:18:54 [ad75dfa4a0] *CURRENT* Added details to frobnicate command (user: user-one tags: trunk) <br>
256
+ === 2021-03-27 === <br>
257
+ 23:58:05 [ab975c6632] Update README.md. (user: user-two tags: trunk) <br>
258
+ ⋮ <br>
259
+ </tt><br>
260
+ fossil diff --from current --to ab975c6632 <br><tt>
261
+ Index: frobnicate.c<br>
262
+ ============================================================<br>
263
+ --- frobnicate.c<br>
264
+ +++ frobnicate.c<br>
265
+ @@ -1,10 +1,11 @@<br>
266
+ +/* made a change to the source file */<br>
267
+ # Original text<br>
268
+</tt></b>
269
+</blockquote>
270
+
271
+"current" is an alias for the most recent version, so the command
272
+"fossil diff --from ad75dfa4a0 --to ab975c6632" gives identical results.
247273
248274
<p>To commit your changes to a local-only repository:</p>
249275
<blockquote>
250276
<b>
251277
fossil commit </b><i>(... Fossil will start your editor, if defined)</i><b><br><tt>
252278
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -242,10 +242,36 @@
242 </blockquote>
243
244 <p>"fossil diff" is the difference between your tree on disk now and as the tree was
245 when you did "fossil open". An open is the first checkout from a repository
246 into a new directory. </p>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
247
248 <p>To commit your changes to a local-only repository:</p>
249 <blockquote>
250 <b>
251 fossil commit </b><i>(... Fossil will start your editor, if defined)</i><b><br><tt>
252
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -242,10 +242,36 @@
242 </blockquote>
243
244 <p>"fossil diff" is the difference between your tree on disk now and as the tree was
245 when you did "fossil open". An open is the first checkout from a repository
246 into a new directory. </p>
247
248 <p>To see the most recent changes made to the repository by other users, use "fossil timeline" to
249 find out the most recent commit, and then "fossil diff" between that commit and the
250 current tree: </p>
251 <blockquote>
252 <b>
253 fossil timeline <br><tt>
254 === 2021-03-28 === <br>
255 03:18:54 [ad75dfa4a0] *CURRENT* Added details to frobnicate command (user: user-one tags: trunk) <br>
256 === 2021-03-27 === <br>
257 23:58:05 [ab975c6632] Update README.md. (user: user-two tags: trunk) <br>
258 ⋮ <br>
259 </tt><br>
260 fossil diff --from current --to ab975c6632 <br><tt>
261 Index: frobnicate.c<br>
262 ============================================================<br>
263 --- frobnicate.c<br>
264 +++ frobnicate.c<br>
265 @@ -1,10 +1,11 @@<br>
266 +/* made a change to the source file */<br>
267 # Original text<br>
268 </tt></b>
269 </blockquote>
270
271 "current" is an alias for the most recent version, so the command
272 "fossil diff --from ad75dfa4a0 --to ab975c6632" gives identical results.
273
274 <p>To commit your changes to a local-only repository:</p>
275 <blockquote>
276 <b>
277 fossil commit </b><i>(... Fossil will start your editor, if defined)</i><b><br><tt>
278

Keyboard Shortcuts

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