issue-#140 Unwrapping IMPORT aliasses

Merged to the master branch

Re: issue-#140 Unwrapping IMPORT aliasses

Postby Josef Templ » Wed Nov 16, 2016 11:13 am

Robert wrote:
DGDanforth wrote:Is that a joke?
No differences?
No.
About 4 posts ago (14 Nov) Josef noticed that I had accidently left some color in a file, so I have set it back to defaultColor, and, as discussed just above, made no other changes.

Don't ask me how he noticed the color.


I use the Diff tool as described in http://wiki.blackboxframework.org/index.php?title=Diff#For_GUI.
For any serious work with git and BlackBox it is required to install a diff tool that
supports the binary .odc file format of BlackBox. Since there are not many tools out there that do support
this file format :x it is required to use BlackBox itself as a diff viewer. And this is exactly what is described.
The diff tool is not perfect but it solves 90% of the needs and it comes (almost) for free.

- Josef
User avatar
Josef Templ
 
Posts: 2038
Joined: Tue Sep 17, 2013 6:50 am

Re: issue-#140 Unwrapping IMPORT aliasses

Postby Robert » Sun Nov 20, 2016 9:23 pm

Time to vote ?
User avatar
Robert
 
Posts: 1023
Joined: Sat Sep 28, 2013 11:04 am
Location: Edinburgh, Scotland

Re: issue-#140 Unwrapping IMPORT aliasses

Postby DGDanforth » Sun Nov 20, 2016 11:51 pm

Robert wrote:Time to vote ?

Robert, could you first summarize the motivation for the changes and
then what has been changed?
User avatar
DGDanforth
 
Posts: 1061
Joined: Tue Sep 17, 2013 1:16 am
Location: Palo Alto, California, USA

Re: issue-#140 Unwrapping IMPORT aliasses

Postby Robert » Mon Nov 21, 2016 9:07 am

DGDanforth wrote:Robert, could you first summarize the motivation for the changes and
then what has been changed?

The issue is described in http://redmine.blackboxframework.org/issues/140 .
The changes are in http://redmine.blackboxframework.org/pr ... 65730f0320 .
The test version is blackbox-1.7.1-a1.735.zip on page http://blackboxframework.org/unstable/issue-%23140/ . ( How do I copy this as an active link? )

For me the big advantage is that the Menu item "Info -> Global Variables" can be used much more conveniently.

During development it was discovered that the existing implementation had quite a bit of replication, and so the new proposal both increases functionality, and reduces total code complexity. It requires that the procedure DevReferences.ResolveImportAlias be exported.This is convenient as it is useful in client Tools and Commands.
User avatar
Robert
 
Posts: 1023
Joined: Sat Sep 28, 2013 11:04 am
Location: Edinburgh, Scotland

Re: issue-#140 Unwrapping IMPORT aliasses

Postby DGDanforth » Mon Nov 21, 2016 10:28 am

vote has been created.
User avatar
DGDanforth
 
Posts: 1061
Joined: Tue Sep 17, 2013 1:16 am
Location: Palo Alto, California, USA

Re: issue-#140 Unwrapping IMPORT aliasses

Postby DGDanforth » Wed Nov 23, 2016 9:07 am

Ivan,
This branch has conflicts that must be resolved
to resolve conflicts before continuing.
Conflicting files
Dev/Docu/Build-Tool.odc
Dev/Mod/Browser.odc
appbuild/newbbscript.txt

Over to you or Robert.

-Doug
User avatar
DGDanforth
 
Posts: 1061
Joined: Tue Sep 17, 2013 1:16 am
Location: Palo Alto, California, USA

Re: issue-#140 Unwrapping IMPORT aliasses

Postby Ivan Denisov » Thu Nov 24, 2016 5:46 pm

Ivan Denisov
 
Posts: 1698
Joined: Tue Sep 17, 2013 12:21 am
Location: Russia

Re: issue-#140 Unwrapping IMPORT aliasses

Postby Zinn » Sat Nov 26, 2016 9:33 pm

There is a mistake in 740.zip at module DevBrowser:

In module DevBrowser the procedure Scan & CheckModName needn't any longer and should be deleted.
Also the call of CheckModName in procedure ShowInterface is wrong and should be deleted too,
because ResolveImportAlias already called in procedure GetQualIdent.

Remember: CheckModName was renamed to ResolveImportAlias and exported from module DevReferences.

- Helmut
Zinn
 
Posts: 472
Joined: Tue Mar 25, 2014 5:56 pm
Location: Frankfurt am Main

Re: issue-#140 Unwrapping IMPORT aliasses

Postby Robert » Sat Nov 26, 2016 11:25 pm

Zinn wrote:There is a mistake in 740.zip at module DevBrowse
Well observed.
I believe the version we voted on (fb08a806) is ok. The problem is in resolving the merge conflict. Are there any tools that can help here?
User avatar
Robert
 
Posts: 1023
Joined: Sat Sep 28, 2013 11:04 am
Location: Edinburgh, Scotland

Re: issue-#140 Unwrapping IMPORT aliasses

Postby Josef Templ » Sun Nov 27, 2016 11:04 am

Robert wrote:Well observed.
I believe the version we voted on (fb08a806) is ok. The problem is in resolving the merge conflict. Are there any tools that can help here?


There is no automatic merge tool for .odc files by now,
at least I don't know it.
All I have is a diff tool, but not a merge tool.
A merge tool would be possible to install under git (e.g. Tortoise Git)
but it is a complicated task to create one.

Therefore I always tried to avoid merge conflicts by choosing the
work packages (issues) so that they are avoided.

- Josef
User avatar
Josef Templ
 
Posts: 2038
Joined: Tue Sep 17, 2013 6:50 am

PreviousNext

Return to Resolved (Features)

Who is online

Users browsing this forum: No registered users and 1 guest

cron