Merging APTs with Tortoise SVN

Discussion forum about all things Gupta, OpenText and the community.
HerbertReuther

Merging APTs with Tortoise SVN

Post by HerbertReuther » 25 Sep 2013, 12:43

Hi all,

did anyone encounter problems when using the Tortoise Merge tool with Gupta TD programs (AP* as text or "indented text")?

We avoid it and rather discard changes than merge files.

Any helpful comment would be appreciated.

Kind regards
Herbert Reuther

randy

Re: Merging APTs with Tortoise SVN

Post by randy » 26 Sep 2013, 08:07

We use it for six years now. We noticed some limitations with the UTF-16 format (blame doesn't work for us for example).
All our source is in text format (expect activex libraries). We have to maintain several versions of our software, so we do the changes in one version and merge it to the others. In generally you have to keep an eye on the changes after a merge. Especially changes on quick tabs are sometimes not okay after a merge. And there are often conflicts in some hex part of the source like viewinfo, resource. In this case I always use the local version.
But usually we know what we have changed so its not a big deal to check the merge result.
So for us SVN saves a lot of time and is a great history tracker.

HerbertReuther

Re: Merging APTs with Tortoise SVN

Post by HerbertReuther » 26 Sep 2013, 12:34

This helps a lot.
Thank you very much.

Igor Ivanovic
Site Admin
Site Admin
Croatia
Posts: 1462
Joined: 05 Mar 2017, 12:37
Location: Zagreb, Croatia

Re: Merging APTs with Tortoise SVN

Post by Igor Ivanovic » 27 Sep 2013, 14:13

Herbert,

I even do a TD2.1 to TD6.2 merge.
It isn't straight forward and involves some manual actions, but it works.
There were/are some problems with indented text in TD versions prior to 4.2, so I'm still using text only.
Igor Ivanovic
Image

Return to “General Discussion”

Who is online

Users browsing this forum: [Ccbot] and 1 guest