-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 7/10/2014 5:22 PM, Stephan Beal wrote: > On Thu, Jul 10, 2014 at 11:01 PM, Andy Bradford > <amb-fos...@bradfords.org> wrote: >> I see, I think I've misunderstood your proposal. You aren't >> suggesting that the Q-card stored in the manifest be >> changed, but that it be allowed to be superseded by >> another manifest that has different information than the >> original (this is how propagating tags and edits work). That's >> a fair question, not one that I think I can address. :-) > > If that summary indeed reflects the goal, i _think_ it's just a > matter of changing the timeline query to do so. Looking at the code > now, i see that graph.c is quite a bit more than a timeline parser, > though, so maybe it's not as straightforward as changing a query.
Yes, this is what I'm going for. (1) Show cherrypicks and backouts in a manner similar to normal merges but using a different color or dash pattern. (2) Allow cherrypicks and backouts to be edited by later manifests the same way comments and tags can be edited. (3) Include cherrypicks and backouts in the ancestor/family/both timelines, the same way merge contributors are shown. Not sure if my image attachment made it to the list, but here's a link to the mailing list archive which may work too: http://lists.fossil-scm.org:8080/pipermail/fossil-users/attachments/20140710/35580a49/attachment-0001.png The image doesn't show any examples of backouts, but I imagine they could be red. The line/s would come from whichever commit/s is/are being undone. - -- 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/ iQEcBAEBAgAGBQJTvxmmAAoJELtYwrrr47Y4NDYIAKUzDFyQyJ5pjMLpktcpko49 MzWmchZL9q/EhBBdMdWtL4jP8/aK4fA4Z28FsZEPazjsX30Md7WzrguAGC138dX/ ZY7+D9sLScvAK9NJOxsMJ251fjehSlBGqb9n5Bb6ujEf5hF2kKJebtOUZaEfRoIa 3gQMuUv8YrxSFNH5uR0IoQJaUj6+zHygwafXZvRbbmD8SgE3xW+nSSv29+pki/6T DnUQjgQWm4mkL/7KS85h+ArSMH1k05K/mxgupZjivXDUVMUT/0ygBjP17vQ52BFt SfMSAtEYIuQCe1DzeNmgnSvyR3enC/k8o98wSExsipx5qUo/zN7D7yxCXq32kk4= =43ec -----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