This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch TINKERPOP-3056 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
discard 7c99643813 TINKERPOP-3056 Fixed bug in mid-traversal mergeE for onMatch add d7c2a7913b TINKERPOP-3056 Fixed bug in mid-traversal mergeE for onMatch This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7c99643813) \ N -- N -- N refs/heads/TINKERPOP-3056 (d7c2a7913b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 4 ++-- gremlin-go/driver/cucumber/gremlin.go | 4 ++-- .../src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js | 4 ++-- gremlin-python/src/main/python/radish/gremlin.py | 4 ++-- .../org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)