search

larshp / abapGitServer

Git server implemented in ABAP
MIT License
64 stars 25 forks source link

Merge-request feature #150

Closed germanysources closed 3 years ago

germanysources commented 3 years ago

This is a work-in-process PR for the merge-request feature. For testing i created a repository with mulitple branches and recorded it with abap_db_preparator.

larshp commented 3 years ago

@germanysources looks good, I'll probably not do a thorough review

But I'm okay with merging this when its done

germanysources commented 3 years ago

@larshp Pull-request is ready. The git merge function works in the browser via WebAssembly (https://github.com/petersalomonsen/wasm-git). The abaplint errors coming from the statement:

DATA BEGIN OF struct.
  INCLUDE TYPE type1 AS a.
  INCLUDE TYPE type2 AS b.
TYPES END OF struct.
struct-a = VALUE #( ... ).

This is probably something not configured yet in abaplint.

larshp commented 3 years ago

yea, its a bug, I've opened https://github.com/abaplint/abaplint/issues/1916, will have a look at it later today(if time permits)

larshp commented 3 years ago

abaplint bugs fixed 😄

larshp commented 3 years ago

thanks 👍