I repost since I fear that attachments blocked the message.
Ok, this is the first try
big-patch-2.0.0.diff should cleanly apply to branch 2.0.0
trunk-changelog should be applied to Trunk, it contains the TOMERGE ->
MERGED changes


So, to power-users and power-coders, please review and apply the
big-patches locally

If you also apply locally (DON'T commit) trunk-changelog you will see
some TOMERGE 2.0 still active.
One of them (2009-12-23 02:59) is actually present in the big-patch in
the form, but please double check should be done on the accented
chars.

Then:
A)
2010-01-13 20:14 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
 * harbour/src/vm/hashes.c
   ! fixed missing HB_STACK_TLS_PRELOAD - thanks to Xavi
    [TOMERGE 2.0]

Can't be applied so TOMERGE 2.0 should be REMOVED. This patch modifies
function hb_hashGetCItemPtr() added by (2010-01-13 09:37 UTC+0100
Przemyslaw Czerpak) that is not flagged as TOMERGE...


B)
2009-12-28 10:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
2009-12-28 01:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
 * src/common/hbtrace.c

Viktor, I don't know which hunks should be merged, can you provide the
patch or give me some clues ?

C)
2009-12-26 14:12 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

You said:
You can merger all my commits. In practice the short answer is:
merge everything except new type modifications (HB_SIZE, HB_ISIZ,
HB_BOOL, ...)

I imagine you were referring to this commit only.... but in this
commit there are some code cleanups and definition of HB_FLOAT... and
changes in matherr.... Sincerely, I'm a bit afraid to break
something....


I'm packing and I will shortly leave for a week - and I will have
limited access to the internet (usually in the late evening) so I may
be a bit slow in answering.



Download: http://www.bruxx.it/frank/big-patch-2.0.0.diff and
http://www.bruxx.it/frank/trunk-changelog.diff

Francesco

PS: all the single patches applied are in different files so it's easy
to modify and rebuild the big patch
_______________________________________________
Harbour mailing list (attachment size limit: 40KB)
[email protected]
http://lists.harbour-project.org/mailman/listinfo/harbour

Reply via email to