Fossil SCM

possible fork with autosync enabled

Closed

057b6d23dad0ec4… · opened 16 years, 5 months ago

Type
Code_Defect
Priority
Severity
Minor
Resolution
Not_A_Bug
Subsystem
Created
Oct. 21, 2009 6:02 p.m.

An accidental fork was created in the SQLite project today with both users having autosync enabled and working online. It is suspected that both users started their commits at about the same time, but because of the different times taken to complete the check-in (editing comments, etc.), a fork was created.


drh added on 2009-10-31 13:17:04:
I don't think this is a bug. This is simply the way distributed version control systems work. The fork is easily resolved using a subsequent merge. Indeed, with DVCSes other than Fossil, that's what you would have to do all the time anyway. Fossil provides auto-sync which helps to reduce forks, but I don't think it can eliminate them 100%.


anonymous added on 2009-11-03 20:02:15:
You could certainly shrink the window though by comparing the version at the start with the version just before the actual commit (once notes, gpg, etc. done.)

Keyboard Shortcuts

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