Hi, 

Few minutes ago, I've commit a small fix on trunk and my commit has
create a fork. I thought that since a while, fossil will not allow
forking unless "--allow-fork" is specified, which I didn't specify. Is
it normal, or is it an uncovered corner case ?

Here's what I got:
--------------------------------------------------------------------
$ fossil ver
This is fossil version 2.5 [2c8bff0b2b] 2017-12-15 01:54:51 UTC

$ fossil up
  ....

  --> investigate, do my simple modification, test, ...
      (about 1 hour total)

$ fossil commit
Autosync:  http://mgag...@fossil-scm.org
Round-trips: 1   Artifacts sent: 0  received: 0
Pull done, sent: 450  received: 1421  ip: 45.33.6.223
vim "../ci-comment-F76B56362B98.txt"
New_Version: 3c2ef25d03fb48d532badb0cba2843de24c1b19f75da27b4b9f0ab0a1fc70349
Autosync:  http://mgag...@fossil-scm.org
Round-trips: 3   Artifacts sent: 2  received: 3
Sync done, sent: 6121  received: 6059  ip: 45.33.6.223
***** WARNING: a fork has occurred *****
use "fossil leaves -multiple" for more details.
**** warning: a fork has occurred *****

      NOTES I took some time to compose my commit message, I don't
             know if it could be a cause...

$ fossil up
Autosync:  http://mgag...@fossil-scm.org
WARNING: multiple open leaf check-ins on trunk:
  (1) 2018-01-16 15:41:34 [3c2ef25d03] (current)
  (2) 2018-01-16 15:32:44 [72fba300c8]
Round-trips: 1   Artifacts sent: 0  received: 0
Pull done, sent: 450  received: 1615  ip: 45.33.6.223

$ fossil leaves -multiple
*** trunk ***
   (1) 2018-01-16 15:41:34 [3c2ef25d03] Fix bad url on "Advanced"/"Basic" link 
of the timeline page. The zLink
       argument of style_submenu_element() should be a literal "%s", otherwise, 
encoded url parameter value may
       contain "%" and get corrupt by the vmprintf() call inside. Problem was 
happening when clicking on
       "Basic/Advanced" link on this page: 
http://www.fossil-scm.org/index.html/timeline?advm=1&chng=src/* (user:
       mgagnon tags: trunk)
   (2) 2018-01-16 15:32:44 [72fba300c8] Update the built-in SQLite to the 
second 3.22.0 beta for testing. (user: drh
       tags: trunk)
--------------------------------------------------------------------


Right after that, I've look at the timeline on www.fossil-scm.org and
the fork was there.


Regards

-- 
Martin G.
_______________________________________________
fossil-dev mailing list
fossil-dev@mailinglists.sqlite.org
http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev

Reply via email to