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

Resolved PB 2017 R3 couple problem with github

  1. Issue
0
Votes
Undo
  1. François Rossignol
    François Rossignol
  2. PowerBuilder
  3. Wednesday, 23 October 2019 11:57 AM UTC

HI,

 

since yesterday we're trying to use github for versionning control with our PB 2017 R3 application.

 

github account are not entreprise accounts but we're planning on going there once things go smouthly

We enever used git before, knowledge of git is really minimal.

 

The setup

Existing PB app and workspace.

Sent to github (user1) with add to source control

Repo is private

 

githuib account user2 added as collaborator for the private repo.

 

user2 did a connect to workspace to get the workspace on his local PC.

 

Issue #1:

user2 can't commit existsing objects with the GIT Commit Menu in PB

user1 can commit the same objects with the GIT commit Menu in PB

user2 can commit those objects with TortoiseGit

user2 can commit objects he newly created

 

Issue #2:

We're getting "Git client error code: Checkout conflicts prevented operation." errors on a regular basis.

Ususally after a rebuild.

With that we can't pull or push anymore from PB.

We need to stack changed to "repair" it

Problems (seems to) comes from conflict in pbl files.

 

Tried to add *.pbl *.pbd to the .gitignore file but no luck.

Is there a correct way to setup/configure to avoid any conflicts on the pbl files ?

 

Thanks in advance.

Regards,

François

 

PB2017 connect to SQL as a service
Getting error like Appeon power builder 2019 has s...
Responses (2)
Tom Jiang @Appeon
Tom Jiang @Appeon Accepted Answer Pending Moderation
  1. Thursday, 24 October 2019 03:08 AM UTC
  2. PowerBuilder
  3. # 1

PB doesn't not commit PBL/PBD changes except for the first time you add the project to the repository. But if one of the developers commits a PBL (using TortoiseGit or Upload PBL in PB IDE), the other developer will have to resolve the conflict (using TortoiseGit). When the PBLs are synced again across the board, you shouldn't have the PBL conflict again, unless someone commits a PBL again using TortoiseGit or using the Upload PBL command in PB IDE.

Regards,

Tom Jiang

Comment
There are no comments made yet.
François Rossignol
François Rossignol Accepted Answer Pending Moderation
  1. Wednesday, 23 October 2019 15:28 PM UTC
  2. PowerBuilder
  3. # 2

Don't know if it's good pratice or not but this seems to do the trick from GIT Bash

git update-index --assume-unchanged *.pbl

 

For the user2 commit problems I forgot to mention:

The Git commit from PB returns success but the objet is still marked as not commited, therefore those objetcs are not up for the push

The files in ws_objects are not read only, nor are they archived

The files in ws_objects reflects the modifications user2 does in the PB IDE

Comment
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.