Fossil SCM

I have two branches. Let's call them trunk and prod_candidate. I have a single fix that I want to pull from trunk into prod_candidate. --cherrypick works great. The only issue is that the merge not indicated in any way on the timeline graph, so there's no way to tell visually that a merge has been done. A dotted or gray arrow to indicate a partial merge would be very helpful.

drh added on 2011-03-17 12:55:27 UTC: Cherrypicks cannot be displayed because cherrypicks are not currently recorded anywhere.

I recently extended the file format to be able to record cherrypicks. But I cannot yet enable the code that actual uses that new part of the file format because older versions of Fossil would not be able to interpret the newer repositories. We need to wait a little while until everybody has updated to a newer version of Fossil that can understand the enhanced format. At that point, I can enable the code that records information about cherrypicks. And then I can update the graph-drawing logic to display the cherrypicks. This will all take time.