Subscribe via RSS
Toggle Submenu
  1. Categories
  2. Recent
  3. Tags
View Replies (3)

Resolved How to update Git from local PBL

  1. How-to
0
Votes
Undo
  1. Valdas Vaitiekaitis
    Valdas Vaitiekaitis
  2. PowerBuilder
  3. Tuesday, 1 June 2021 13:59 PM UTC

I have my code uploaded to Git repository. How can I update that Git repostory from local PBL files that are not synced with Git? What are the steps to regenerate ws_objects folder and push it to overwrite master repository?

I am OK with  losing my previous changes and just owerwriting everything with new PBL files, but of course it would be better if I could somehow merge Git objects with local PBL objects.

I tried just coppying PBL files to my project, then opening it and executing Git Commit, PowerBuilder found new objects that where added in the new PBL files, but did not iddntify any removed or modified objects.

Then I tried to unlink my project from Git and re-add it back to source control. Looks like PowerBuilder regenerated ws_objects. I then was able to succesfully push them to Git, however deleted objects are still present in Git and ws_objects folder, and they are restored into new PBL files after doing Git Refresh.

  1. Git
  2. PowerBuilder
Menu Icons not appearing
Bit datatype and MSOLEDBSQL driver
Responses (3)
René Ullrich
René Ullrich Accepted Answer Pending Moderation
  1. Wednesday, 2 June 2021 12:08 PM UTC
  2. PowerBuilder
  3. # 1

Hi Vladas,

There is a very simple way: Open the changed object in your workspace that is connected to git. Do some little changes and save the object. PowerBuilder will update the changed object in ws_objects directory.

HTH,

René

Comment
There are no comments made yet.
Benjamin Gaesslein
Benjamin Gaesslein Accepted Answer Pending Moderation
  1. Wednesday, 2 June 2021 11:30 AM UTC
  2. PowerBuilder
  3. # 2

Hi Valdas,

try adding the altered PBLs to a different workspace that is not connected to git. Use the library painter to export the source files from the PBLs in question to your drive. (Hold [ALT]+[S] on the export window if there's lots of sources, PB asks for a destination for every file) Then copy the exported files to the appropriate folders within the ws_objects folder of your git-connected workspace.

Now there are two ways to proceed:

1. Use your git client (commandline/tortoisegit, whatever should work) to commit and push the changed source files to the repo. Then open the workspace in PB and do a pull and refresh - the changes should now be there. This way might lead to issues loading the changes from git if there were any conflicting edits that lead to compiler errors.

2. Open the workspace in PB and do a refresh. This will import the changed source files from ws_objects/xxx.pbl.src into xxx.pbl. If there are any conflicting changes leading to compiler errors, the refresh might also fail and you might have to edit the source files directly to fix this. Afterwards you can push and commit the changes from within PB.

Comment
There are no comments made yet.
Chris Pollach @Appeon
Chris Pollach @Appeon Accepted Answer Pending Moderation
  1. Tuesday, 1 June 2021 18:36 PM UTC
  2. PowerBuilder
  3. # 3

Hi Valdas;

  Just use the RMB on the PB App's WorkSpace and then select "GIT Push" from the resulting pop-up menu.

Regards ... Chris

Comment
Valdas Vaitiekaitis
  1. Valdas Vaitiekaitis
  2. Wednesday, 2 June 2021 05:11 AM UTC
Sorry, I think I need to clarify my question a bit: I have chanes in PBL files, that were made in another instance of PowerBuilder while not connected to Git. I need to merge those changes with my project. I am OK with loosing changes made on my side, I am OK with just replacing my PBL files with new ones, but how do I push objects from new PBL files to Git?
  1. Helpful
There are no comments made yet.
  • Page :
  • 1


There are no replies made for this question yet.
However, you are not allowed to reply to this question.