error after merge

forum.team.object.manager (2000-2005) & forum.td.tom (2005-2010)
Niels Allerheiligen

error after merge

Post by Niels Allerheiligen » 05 Aug 2005, 14:16

 Posted by:  Niels Allerheiligen 

Hi,

we recently converted from CTD 1.5.1 to GTD 2005.
I saved every file as text with CTD 1.5.1 and opened it with GTD 2005.
Compile, save as text and so on. Then I checked them in with TOM2005.

After every merge of our main app, we get errors when the apls are read.
"Not enough memory to create outline item."

Did I forget to convert something for TOM? It's a real pain to use the
diff/merge tool, check for differences and merge them manually.

-Niels-

Jeff Luther
Site Admin
Site Admin
United States of America
Posts: 2168
Joined: 04 Mar 2017, 18:34
Location: Palm Springs, California

error after merge

Post by Jeff Luther » 06 Aug 2005, 03:13

 Posted by:  Jeff Luther 

Niels:

I agree ("a real pain") and the first thing I'd check is to make sure
your main app is ok. Get it to load in, comment out all APL includes, save
under a *different* name, File/New..., then read in the file again. (And
be sure it's saved in text mode as well.) This may help you determine where
your 'not enough...' error is coming from.

Another place to look: TD has limits on # of parms. in a function, # of
constants you can declare, etc. Look for an outline section that's loooong.
This may help you find out where the error is coming from.

Last resort, break up your appl. into sections and try to read each in. You
may be able to narrow down the problem down that way.

Speaking of diff/merge, if you do finally throw up your hands and want a
GOOD TD file compare program, go here: http://www.scootersoftware.com/

I'm involved now in remote programming and using TOM for check in/out, and
frankly find the tool not 'up to standards.' I can't seem to even keep a
file checked out with TOM; if I do, then a day or so later try to check in,
it does its merge, gens. several files and directories, *AND* changes the
original code I was trying to check in!!! This code ends up with multiple
copies of a dlg box, etc., which naturally now won't compile. (I'm using
TD 2005, BTW.)

Anyway, I never leave files checked out with TOM, I manually diff (using
the Beyond Compare tool above) and merge by hand. I just hate some 'tool'
doing something 'auto-magically' for me. Old-fashioned, I guess.

Let us know what you find. And good luck! These 'head-scratchers' are no
fun...

Best Regards,
Jeff Luther/PC Design
www.pulpcards.com/gupta/

Niels Allerheiligen

error after merge

Post by Niels Allerheiligen » 08 Aug 2005, 09:44

 Posted by:  Niels Allerheiligen 

Hi Jeff.


I have done that the first time the error appeared. I could narrow it
down to 4 or 5 apls. The problem was that each of them includes the
others as well, so I don't know for sure which one causes this error.

The funny thing is that neither of them was changed. Including these
apls into a new application does not throw an error.

Ok, but then I should get the error everytime, right?

I will have a look. If Steve Gibson uses it, it can't be bad. :)

I know that behaviour. TOM generates a folder named __Merge with three
subfolders. In each of them you find the versions which are used for the
3-way-merge.

Sometimes you end up with 3 pieces of code. It seems that TOM cannot
determine which is the merged version and therefore leaves all three
commented in.

You must now have a look on the duplicated parts and comment out the
wrong ones. I usually leave these commented parts in the file for a few
days, in case I made a mistake. That worked very well until we converted
to TD2005.

But it saves some time (if it works).

Thanks.

-Niels-

Niels Allerheiligen

error after merge

Post by Niels Allerheiligen » 10 Aug 2005, 10:06

 Posted by:  Niels Allerheiligen 

Is there a possibility to make TOM save the merged file as text and
_not_ precompiled? Perhaps we could then see what happened and repair it
instead of doing a complete merge by hand.

What we do now open the version 1 from the __Merge folder and merge it
manually with version 2 from the __Merge folder. This takes up to 30
minutes a day and is rather frustrating. :(

-Niels-

Jeff Luther
Site Admin
Site Admin
United States of America
Posts: 2168
Joined: 04 Mar 2017, 18:34
Location: Palm Springs, California

error after merge

Post by Jeff Luther » 10 Aug 2005, 17:27

 Posted by:  Jeff Luther 

I have not tried this (yet), Niels, but a thought I had for getting around
the diff/merge and bad code problem with TOM was to ZIP the files before
adding to TOM. That should keep its 'hands' off the code! Let me know if
you try this and how it goes.

See my previous msg. too on a link to the Beyond Compare utility, if you
need a good diff/merge tool. (I use it to diff only, though I see that one
can move code from one window pane to the other. The 2 files are displayed
in each of 2 window panes in the application.)

Best Regards,
Jeff Luther/PC Design
www.pulpcards.com/gupta/

Niels Allerheiligen

error after merge

Post by Niels Allerheiligen » 10 Aug 2005, 18:30

 Posted by:  Niels Allerheiligen 


I guess that equals to unchecking the "SQLWindows editable" box (see
screenshot). In this case the file cannot be concurrently checked out
and a merge is no longer necessary/possible. That happens for example
when I add Delphi sources for our DLLs to the repository.

I have downloaded the trial version and it looks very nice. However, I'd
rather have a working TOM than doing the merge by myself. I'm lazy. :)

I wrote a little test case which includes the offending libraries and
provoked a merge conflict. No problems so far. Perhaps I just need more
memory on my machine, who knows...

-Niels-

Attachment: tom1.JPG

Jeff Luther
Site Admin
Site Admin
United States of America
Posts: 2168
Joined: 04 Mar 2017, 18:34
Location: Palm Springs, California

error after merge

Post by Jeff Luther » 10 Aug 2005, 19:26

 Posted by:  Jeff Luther 

"I guess that equals to unchecking the "SQLWindows editable" box (see
screenshot)." I guess it does, though it doesn't sound like that was an
option for you either, considering your previous messages on the problems
you were having with merge/diff, the error msg. "Not enough memory to
create outline item." and so on.

If you do uncheck the box, let us know if that's the solution you were
looking for.

- Jeff

Niels Allerheiligen

error after merge

Post by Niels Allerheiligen » 12 Aug 2005, 11:20

 Posted by:  Niels Allerheiligen 


No, that's not an option.

Yesterday, we changed the machines and let the one with the most memory
do the merge. No problem at all. Perhaps this problem is really related
to physical memory...

I'll keep you updated.

-Niels-

Niels Allerheiligen

error after merge

Post by Niels Allerheiligen » 23 Aug 2005, 13:36

 Posted by:  Niels Allerheiligen 


Well, nothing new here. The problem still appears and changing machines
didn't help. :(

-Niels-

Return to “td.tom”

Who is online

Users browsing this forum: [Ccbot] and 0 guests