From b31885796df21008eb664dcabb42273658deef45 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Tue, 8 Dec 2020 11:16:04 -0500 Subject: [PATCH] Fix pull errors related to files deleted remotely (#4281) In case files are deleted remotely, the files are now ignored during a pull. In other words, "pull" will not touch objects that exist only locally and not remotely. To delete such objects locally, use "reset local (forced pull)" which will show a popup for these objects and let you delete them. Closes #4277 Co-authored-by: Lars Hvam --- src/objects/zcl_abapgit_objects.clas.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/objects/zcl_abapgit_objects.clas.abap b/src/objects/zcl_abapgit_objects.clas.abap index 2387054c2..4e9f93b90 100644 --- a/src/objects/zcl_abapgit_objects.clas.abap +++ b/src/objects/zcl_abapgit_objects.clas.abap @@ -670,7 +670,7 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. it_items = lt_items ). lo_folder_logic = zcl_abapgit_folder_logic=>get_instance( ). - LOOP AT lt_results ASSIGNING . + LOOP AT lt_results ASSIGNING WHERE rstate <> zif_abapgit_definitions=>c_state-deleted. li_progress->show( iv_current = sy-tabix iv_text = |Deserialize { -obj_name }| ).