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

Resolved "Reference was not fast-forwardable" error using VS GIT Sourcecontrol

  1. How-to
0
Votes
Undo
  1. Brage Mogstad
    Brage Mogstad
  2. PowerBuilder
  3. Wednesday, 25 July 2018 08:06 AM UTC

Using Appeon sourcecontrol using Visual Studio GIT set up with local repository. Code checked in fine, version control worked fine. Untill I copied a PBL file modified outside GIT directly to VS Git. Appeon  failes with the error: Reference was not fast-forwardable.

This is not the most common need - but sometimes changes may be made by developers outside GIT, or some member of the team may do it unpurposely.

I've tried to execute a "Git Pull" (to synchronize the server repository with the local repository) and then execute "Git Push" again, with no luck. 

It has to do with binary changes - Appeon is capable to understand the PBL has changed, but not able to resolve it so far.

Tools & versions:
Win 10 Pro 64 bit OS ver 1709 build 16299.309
Appeon Powerbuilder Standard Edition Version 2017 R2 Build 1769
GIT Local respository, VS Team GIT

 

B 

 

SVN Update - Skipping conflicted directory update
[Articles & Blogs > Tips & Tricks] Corrupt article...
Responses (1)
Tom Jiang @Appeon
Tom Jiang @Appeon Accepted Answer Pending Moderation
  1. Wednesday, 25 July 2018 08:34 AM UTC
  2. PowerBuilder
  3. # 1

The PBLs are not supposed to be source controlled. The reason that they are uploaded to the server is to make it easier to set up a new developer. A PBL is basically a placeholder and every time you pull from the server the updated objects will be imported to the corresponding PBL again. It doesn't work the other way around (exporting the objects from a PBL to replace the source files for the associated objects.)

As a workaround, you may put your updated PBLs in a dummy workspace, and when you add it to source control, it will split out all the objects. You can then copy them to your real working directory and then use a Git client tool to push them to the server. 

When you start PB IDE, remember to use the refresh content menu to get all the updated objects into the PBLs/IDE. 

Regards,

Tom Jiang

Comment
Brage Mogstad
  1. Brage Mogstad
  2. Wednesday, 25 July 2018 08:51 AM UTC
Thanks, that makes it clearer. In traditional VS this was not an issue, but in GIT it is.

For me, this means, it is actually a point of no return if someone by accident or intentionally overwrites a PBL in the GIT. In other words, administrators must make sure this can never happen.



B

  1. Helpful
Tom Jiang @Appeon
  1. Tom Jiang @Appeon
  2. Wednesday, 25 July 2018 09:15 AM UTC
When such accident occurs, you may use a Git client, like TortoiseGit, to get the previous version of the PBL, and then commit it to get things back on track. PowerBuilder is not a full-blown Git client. You may still need to use another Git client to work with Git to solve certain issues. But we are working on improving the functions. Thanks for your feedback on these issues!
  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.
We use cookies which are necessary for the proper functioning of our websites. We also use cookies to analyze our traffic, improve your experience and provide social media features. If you continue to use this site, you consent to our use of cookies.