This is unchanged text which has not been This is unchanged text which has not been
touched in the method touched in the method
This is an insertion of two lines which has been
changed in my image (printed in green)
This text was removed in the newer edition
in the image and is printed in red here
And from here on there are no more changes. And from here on there are no more changes.
jtuchel wrote:First of all, I think not going for a Seaside based solution is a good idea. We'd lock out many users from a new tool. For now, VAST is a local, GUI-based development tool. I guess the Win95 part will not be desirable for several users on Linux and AIX or Solaris. So if there is a chance to go with Extended Widgets alone and keep it portable, it's sure better to make adjustments to existing text widgets rather than limiting the changes tool to Windows.
jtuchel wrote:One thing I really would like to see improved is the merging actions. After several years of using VAST, I still find "Load alternatives" and "Release loadad" confusing and un-intuitive. And I think it would be nice to really merge only parts of editions, meaning accepting some chnages/editions/removals and forgetting others. So when you go thorugh the differences, I'd like to have a button to either accept a change or leave it out of a new edition. The Browser should then update and show this resolved difference as equal between both editions.
This is an example of me experimenting, but it doesn't do the job since Envy has 'apps & editions', 'classes & editions', 'methods & editions'. Putting six list boxes on a screen, 12 total (six for each side), clutters it up too much. Pharo has a much easier time since it is 'change set & classes'. This organizing of screen real estate into something useful but not cluttered is a 'sticking' point.
So I'd vote for a tool that does one thing in the best possible way: merge two method editions into another one with as little effort as possible.
I haven't looked at what algorithm the current changes browser uses. But, we might want to enhance it.
tc wrote:I can help with that. In an internal meeting, it was pointed out that the changes browser does a string compare. That appears to be true.
My earlier comments were on "How to select the two, or three, methods to compare and merge". While I think we need a better method to manage that side of the common cases of "merge two versions of an app, or two versions of a class", I certainly have no issue with focusing on the "bottom" of the screen first.
I like most of your ideas of how to make the code display and merge better. It's reasonable to only make changes to the loaded edition of a method. Undo is important.
daswartz wrote:The only idea I'm not comfortable with is the one to put a selection drop-down above each comparison pane to change which edition of the method I'm comparing. I would almost always use this tool in a larger context, ie, the merge of two different application or class versions. So, easily changing which editions of an individual method I'm comparing would almost never be needed and might be undesirable
Users browsing this forum: No registered users and 1 guest