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

Resolved Format of PBT causes Merge Conflicts on new PBLs

  1. Issue
0
Votes
Undo
  1. Chris Heale
    Chris Heale
  2. PowerBuilder
  3. Tuesday, 8 October 2019 21:32 PM UTC

Hello

We've been using PB 2019 and GIT (BitBucket Server) now for some time, and with some custom scripting (a refresh-all.ps1 that uses PBC to rebuild PBLs from source) its all working rather smoothly.

However, I noticed that there is a problem with the PBT file in that the library list entry is a single continuous line (separated by semi-colons).

Therefore, if 2 or more developers add PBLs, it results in a Merge Conflict requiring manual intervention. Manually resolving the merge on this single line of code was a bit involved too... I used Excel, Text to Columns and Transpose functions to compare the incoming differences and build a combination list from the 2 sources.

This would all be alleviated if the PBT LibList had line-feeds between each entry... GIT would be able to do an auto merge of these 2 lists.

Anyone else experienced this? Any plans to resolve?

Thanks!

...Chris

  1. Git
  2. Library
  3. Merge
  4. PowerBuilder (Appeon)
Changing the background color of a group header wh...
Code priority over theme
Accepted Answer
Michael Kramer
Michael Kramer Accepted Answer Pending Moderation
  1. Tuesday, 8 October 2019 22:23 PM UTC
  2. PowerBuilder
  3. # Permalink

I commend your suggestion.
File format should encourage multi-developer projects not work against our needs.

First line of .PBT file contains a file format version number so the file format is enabled for future improvements.

Please submit to Appeon as a feature request. Appeon are doing both major extensions and minor albeit important improvements to PowerBuilder and the developer experience in each release.

Thanks, /Michael

NOTE
Main menu of any large app has same issue as the .PBT file: Multiple developers "compete" for access to extend - and hence merge or block depending on type of version control.

I always recommend working on such files/classes/objects for as short period as possible:
1) Add new PBL. Commit immediately despite yet no content.
2) Add menu item. Commit immediately despite yet no code.
2B) When window committed: Now add open logic to menu item. Commit immediately.
(similar for any other logic in new menu item).

In all cases (1, 2, 2B) the app remains runnable after every commit.

 

Comment
Chris Heale
  1. Chris Heale
  2. Tuesday, 8 October 2019 22:27 PM UTC
Thanks for the support.. will file a feature/improvement request.

Cheers, Chris
  1. Helpful
There are no comments made yet.
Responses (2)
Roland Smith
Roland Smith Accepted Answer Pending Moderation
  1. Wednesday, 9 October 2019 02:45 AM UTC
  2. PowerBuilder
  3. # 1

I would think that if a developer is doing something as major as adding a library, they would coordinate with their fellow developers beforehand. Source control shouldn't be used as a replacement for talking to your co-workers.

It sounds like poor teamwork to me.

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.