On 04/11/11 19:11, Richard Hipp wrote: > Fossil does not (currently) record any information about cherry-picks. I > did make an extension to the file format to allow Fossil to do this in the > future. But I only made that extension this year. If any information is > recorded about cherry-picks, people with older versions of fossil won't be > able to read repositories that make use of this extension. So I need to > wait until everybody has upgraded to a more recent version of Fossil before > I add the code to actually record the cherry-picks in the manifest files.
Good stuff! I guess the use cases are: 1) Drawing nice (dotted? grey?) arrows in the ui timeline to show cherry-pick mini-merges cleanly 2) Smarter merging when some of the content has already merged (either way) due to cherry-picks It strikes me that, for the latter, it might be good if cherry-picks went into their own commits rather than potentially mingling with other changes (or even with each other; I'm not sure). What are people's use-cases for cherry picks, out of interest? I tend to use them (in git, at least) for pulling in some of a contributer's contributions but not others, in which case the merge problem is theirs when they merge my latest trunk into their branch. ABS -- Alaric Snell-Pym http://www.snell-pym.org.uk/alaric/ _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
