edgent-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Christofer Dutz <christofer.d...@c-ware.de>
Subject Re: confused by network graph - is something amiss?
Date Tue, 07 Nov 2017 13:42:34 GMT
Hi Dale,

to me it looks absolutely correct. Could it be that it takes a while for the network view
to update?
Even in my IntelliJ Git view all looks good.

Could you please verify that you are still seeing problems?


Am 07.11.17, 00:02 schrieb "Dale LaBossiere" <dml.apache@gmail.com>:

    I’m confused by what I’m seeing in the network graph on GitHub [1] and wonder if something’s
    in either the way that the feature/maven branch was merged to develop or the config of
my fork’s [4] develop branch or ???
    Previously I noted that I had created and merged PR-317 [2] and PR-318 [3] to the develop
    In the graph, the merge of change 31bc375 via PR-317 looks weird.  What did it get merged
    I expected to see that “merge Pull Request #317” merge from the black branch to the
purple (presumably “develop”) one… but it isn’t drawn that way. It ends up getting
there via a “Merge remote tracking branch…” commit of your’s (9f75a0f)???
    I think the merge of PR-318 looks OK (to the purple/develop branch) but my edgent-393-ranges
task branch didn’t visually branch off the purple/develop branch the way I expected.
    For what it’s worth here’s the config of my clone of my fork [4]
    @Dales-MacBook-Pro:757> git status
    On branch develop
    Your branch is up-to-date with 'origin/develop'.
    nothing to commit, working tree clean
    @Dales-MacBook-Pro:758> git remote -v
    origin  https://github.com/dlaboss/incubator-edgent.git (fetch)
    origin  https://github.com/dlaboss/incubator-edgent.git (push)
    upstream        https://github.com/apache/incubator-edgent.git (fetch)
    upstream        https://github.com/apache/incubator-edgent.git (push)
    [1] https://github.com/apache/incubator-edgent/network <https://github.com/apache/incubator-edgent/network>
    [2] https://github.com/apache/incubator-edgent/pull/317 <https://github.com/apache/incubator-edgent/pull/317>
    [3] https://github.com/apache/incubator-edgent/pull/318 <https://github.com/apache/incubator-edgent/pull/318>
    [4] https://github.com/dlaboss/incubator-edgent <https://github.com/dlaboss/incubator-edgent>

View raw message