SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 12:20:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

bugfix, merge logic

Browse Source
This commit is contained in:
larshp 2016-07-14 10:05:05 +00:00
parent 374b7810a0
commit a6b14f627a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zabapgit.prog.abap
View File

@ -3,7 +3,7 @@ REPORT zabapgit LINE-SIZE 100.
* See http://www.abapgit.org * See http://www.abapgit.org
CONSTANTS: gc_xml_version TYPE string VALUE 'v1.0.0', "#EC NOTEXT CONSTANTS: gc_xml_version TYPE string VALUE 'v1.0.0', "#EC NOTEXT
gc_abap_version TYPE string VALUE 'v1.15.12'. "#EC NOTEXT gc_abap_version TYPE string VALUE 'v1.15.13'. "#EC NOTEXT
******************************************************************************** ********************************************************************************
* The MIT License (MIT) * The MIT License (MIT)

6
src/zabapgit_page_merge.prog.abap
View File

@ -188,6 +188,7 @@ CLASS lcl_merge IMPLEMENTATION.
* added in source * added in source
_from_source. _from_source.
<ls_result>-sha1 = <ls_source>-sha1. <ls_result>-sha1 = <ls_source>-sha1.
CONTINUE.
ELSEIF lv_found_source = abap_false. ELSEIF lv_found_source = abap_false.
* added in target * added in target
<ls_result>-sha1 = <ls_target>-sha1. <ls_result>-sha1 = <ls_target>-sha1.
@ -200,7 +201,10 @@ CLASS lcl_merge IMPLEMENTATION.
IF lv_found_source = abap_false IF lv_found_source = abap_false
OR lv_found_target = abap_false OR lv_found_target = abap_false
OR lv_found_common = abap_false. OR lv_found_common = abap_false.
_raise 'merge conflict, not found anywhere'. CLEAR gs_merge-result.
gs_merge-conflict = |{ <ls_file>-name
} merge conflict, not found anywhere|.
RETURN.
ENDIF. ENDIF.
IF <ls_target>-sha1 = <ls_source>-sha1. IF <ls_target>-sha1 = <ls_source>-sha1.