1. ATK Gimmy Susan
  2. PowerBuilder
  3. Wednesday, 18 September 2019 11:02 AM UTC



Hi Guru
I find that Powerbuilder in commit + Push also sends pbls to repositories. Why ?
(I seem to notice that it happens when the system performs a merge).

I attach screenshoots


Every help is precious.

 

Gimmy

 

 


Ecosystem
- Powerbuilder 2017r3
- Git v2.20.1
- Repository: Azure DevOp

- Pbls are in the repository, but are excluded from the game by gitignore.

- this is the content of the gitignore:
* .opt
* .log
* .exe
* .pbl
* .pbd
* .dll
* .html
! PblSave / *

 

 

Attachments (3)
Accepted Answer
ATK Gimmy Susan Accepted Answer Pending Moderation
  1. Thursday, 19 September 2019 14:40 PM UTC
  2. PowerBuilder
  3. # Permalink

The solution at my problem is:

 

git update-index --skip-worktree *.pbl

Comment
There are no comments made yet.
Michael Kramer Accepted Answer Pending Moderation
  1. Wednesday, 18 September 2019 11:20 AM UTC
  2. PowerBuilder
  3. # 1

Native git integration has option to upload PBL files. This ensures that your version control repo includes your library list files. Using "legacy" source control you had to perform "Get Latest Version" twice whenever someone else added a PBL file to the library list.

AND - Icon assigned to your application object and the fonts defined for the application are stored in the PBL file but not in the exported application object. So you must include that PBL file to keep such config under source control.

HTH /Michael

Comment
  1. Michael Kramer
  2. Wednesday, 18 September 2019 15:36 PM UTC
Note: Whenever you change "current target" in PB IDE's system tree you actually modify the PBW file. You can avoid accidental commits to the PBW file by always committing with the same target selected as current target. - Or, remember to deselect the PBW file every time you commit changes unless you actually made a change to the PBW file that deems it committed.
  1. Helpful
  1. ATK Gimmy Susan
  2. Thursday, 19 September 2019 10:01 AM UTC
Hi Michael



unfortunately not.

The list library is the same.

My test only modifies one object (different between user A and user B ).



The resolved is:

The local commit of the two users does not include the pbl.

the merge-commit, made by git, which sends the pbl to the repo.



  1. Helpful
  1. Michael Kramer
  2. Thursday, 19 September 2019 10:36 AM UTC
Trying to grasp all details since devil is most often in the miniscule detail >>>

It is the [Git Push] from PB IDE (performed by developer A) that you experience in effect performs a "git merge" which includes the PBL file?
  1. Helpful
There are no comments made yet.
ATK Gimmy Susan Accepted Answer Pending Moderation
  1. Wednesday, 18 September 2019 12:36 PM UTC
  2. PowerBuilder
  3. # 2

Update on the sequence of operations performed:

 

1)- User A: do a clone from repository ( pbl + exported files )

2)- User B: do a clone from repository ( pbl + exported files )

3)- User A: modify code

4)- User A: execute a COMMIT

5)- User B: modify code

6)- User B: execute a COMMIT;

7)- User B: execute a PUSH;

8)- User A: execute a PULL;

9)- User A: execute a PUSH;

 

The result is:

In Step '9' we have a merge.

Powerbuilder send to the repo all modified objects ( step '3' and in commit on step '4' ) + all objects downloaded at step '8' + PBL.

IT'S VERY STRANGE 

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.