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

Resolved SVN Update - Skipping conflicted directory update

  1. Issue
0
Votes
Undo
  1. Madhu Krushnamraju
    Madhu Krushnamraju
  2. PowerBuilder
  3. Tuesday, 24 July 2018 21:10 PM UTC

Hi,

When am trying to do SVN-Update, conflicted directory is skipped to update.

Developer #1 - Made changes on one object and committed to SVN.

Developer #2 - Made code changes on same object and trying to commit to SVN. SVN commit is failed as expected. And, tried to update object by using SVN Update but skipping to update conflicted directory.

Even, PBL/application level SVN update is failed.

 

Please refer attached screen shot and advise asap!

 

Thanks!

Attachments (1)
7CED1002.PNG 7CED1002.PNG
  1. PowerBuilder (Appeon)
PBSHR170.DLL and Connectivity
"Reference was not fast-forwardable" error using V...
Responses (1)
Tom Jiang @Appeon
Tom Jiang @Appeon Accepted Answer Pending Moderation
  1. Wednesday, 25 July 2018 07:43 AM UTC
  2. PowerBuilder
  3. # 1

Hi,

From the error message it seems you have this "C:\PB17_SVN\ws_objects\Delivery" folder. Did you create it on your own. Normally, the folders under ws_objects are named as ***.pbl.src.  They match the PBL files in your workspace. I suggest that you keep your own resource files apart from the PB generated folder structure to avoid any conflict. I also suggest that you resolve the conflicts in your resource files with a SVN client tool before working on your project in PowerBuilder. 

Regards,

Tom Jiang 

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