[fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Goth
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 At work we use ClearCase version tree merge arrows to visually indicate what Fossil calls cherrypick and backout merges. For a cherrypick merge, we draw a merge arrow from the contributor version(s) to the new version. For a backout merge, we tend

[fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Goth
-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

[fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Goth
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 7/10/2014 3:14 PM, Andy Goth wrote: 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

Re: [fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Bradford
Thus said Andy Goth on Thu, 10 Jul 2014 15:14:07 -0500: Not all cherrypicks and backouts are done by [fossil merge]. Around here, lots of things are done by hand. I see what you mean. You're looking for a way to tag something as ``merged'' by copy-paste and not using merge

Re: [fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Stephan Beal
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 superceded by another manifest that has

[fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Goth
-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

Re: [fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Bradford
Thus said Stephan Beal on Fri, 11 Jul 2014 00:22:52 +0200: 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