-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 7/10/2014 2:37 PM, Andy Bradford wrote: > Thus said Andy Goth on Thu, 10 Jul 2014 14:27:57 -0500: > >> I want to see something in the timeline plot showing >> cherrypicks and backouts. Dotted, dashed, and/or colored lines >> might do the job. I also want to see the origins of cherrypicks >> and backouts listed in the family, ancestors, and both timeline >> links on the check-in info page. > > This has been brought up before (I specifically mentioned that it > should be possible given that the cherrypick merge is recorded > with a Q-card), but this is probably low priority. :-)
I'm putting together a mockup screenshot illustrating a few ideas and motivating this feature, but it's not ready yet. Can I send it to this list as an attachment, or do I have to host it somewhere and link to it? >> Let me make a request. If this feature is added to Fossil, I >> would like it to be possible to edit the cherrypick and backout >> merge arrows after the commit is complete, in the same way it's >> possible to edit tags. (Perhaps this could be implemented as >> special tags rather than as a new card type.) > > I'm not sure how this would work given that the source of the > cherrypick is stored in the Q-card and is not alterable > thereafter. It would seem to me that it shouldn't be possible for a > cherrypick to be incorrect, or there's a bug in Fossil so what > sense would there be in being able to edit it? Not all cherrypicks and backouts are done by [fossil merge]. Around here, lots of things are done by hand. Having better tools than what we have could help to improve matters, but there is a lot of inertia, habit, and general unwillingness to learn how to use the available tools as intended. Therefore it won't be possible for Fossil or any other CM system to always automatically know what merges have taken place. I don't know anybody who uses the merge tool that comes with ClearCase, so I really can't expect everyone to consistently use [fossil merge], should we adopt Fossil. What do the Q cards accomplish for cherrypicks and backouts? First off, am I right in assuming that "Q +" and "Q -" correspond to cherrypick and backout? Okay, so does this information get used for anything? It doesn't seem to be displayed anywhere outside the manifest. Tags and comments are editable, and this does not confuse Fossil. It knows not only the original tags and comments but also all edits, and it displays the accumulation of edits without losing track of the originals. So I don't see why Q cards can't be edited in the same way. - -- Andy Goth | <andrew.m.goth/at/gmail/dot/com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJTvvQPAAoJELtYwrrr47Y4zr0H+gPhLCHL6X7lPKCn6mKbYJMO /EdPl6nf3m9Vw4be50cj8uez1ZWxeGEkgjbG6P+/xKdfq6h81O/N6TbFpxZA2tgP kNYbxR1DQzpmC7rVrKcUA7h5j99LpuX32Y0jhgDChuyS1XgE0+y31B8r+JZy7WNC aU+NwJ+t0N2WQL2SS+/Js32C7O7WdegkKvgeuGxGcbqnUEn9up8eL/DTWtD+aFCb 9gSn26yHfsabQ1+jdRupnvBu2kP0YkCOjRyGemtg9vS61TrSBqwtKCM+5jNABI7L uf/f0kvU7WhgtB/47GfyBh6kwLq3MvhWt0Ix9oChMbtb2DoMIp2vAXWsQc6ASNo= =F7bT -----END PGP SIGNATURE----- _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
