As I said, I'm out and ingernet connection is worse than expected
at least today don't know next days.
Yes, I worked on linux and transformed the repository in a mercurial
repos... I will check the problems you report asap.
Francesco
___
A quickly answer:
On Sat, Jan 23, 2010 at 1:45 AM, Viktor Szakáts harbour...@syenar.hu wrote:
Hi,
1) hbtrace.c
only some changes to hbtrace are marked TOMERGE and so the marked
patches don't apply.
Can I use the TRUNK version ?
I think you can't. Several features were added
to this
Ok I will try to manually merge all the revisions I listed in my message..
You can merger all my commits. In practice the short answer is:
merge everything except new type modifications (HB_SIZE, HB_ISIZ,
HB_BOOL, ...)
Can't see the source files now, I will check later
Francesco
5) 2010-01-13 20:14 UTC+0100
it doesn't apply because it must be applied to lines added by
2010-01-13 09:37 UTC+0100 Przemyslaw Czerpak that was not marked as
TOMERGE that added some similar lines in the same lines confusing the
patch system. Should I MERGE it ?
This change is not marked
For example in one of your patches (about unicode overflow protection)
there were changes to win_prn3 (TEXT(0)) not listed in the Changelog
and I can't know if they are needed or not... in anay case, they don't
apply..
Which commit was that?
Sorry, my fault, it was ok
Francesco
3) 2010-01-05 18:48 UTC+0100 Viktor Szakats
only in hbmk2.pt_BR.po, probably due to not applied patches at point 2.
The hbmk2.prg -warn fix should go though, it's definitely
a manual merge, since multiple changes were done in
this one commit.
Ok, it was my fault, the patch should be:
@@
3) 2010-01-05 18:48 UTC+0100 Viktor Szakats
only in hbmk2.pt_BR.po, probably due to not applied patches at point 2.
The hbmk2.prg -warn fix should go though, it's definitely
a manual merge, since multiple changes were done in
this one commit.
Ok, it was my fault, the patch should be:
@@
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
Hi Francesco,
It came through, thank you.
Here are my results:
1) I had to 'unix2dos *.diff' to make it work on Windows.
2) I had to move my freshly checked out branch 2.0 dir
(named 'harbour-2.0' by default) to b/harbour/ dir to
make it work.
(it would be nice if the patch would just
I proceeded with the merge work and I found some problems in the process...
1) hbtrace.c
only some changes to hbtrace are marked TOMERGE and so the marked
patches don't apply.
Can I use the TRUNK version ?
2) hbmk2.pt_BR.po
there are several commits for this file and for some of them the label
Hi,
francesco perillo wrote:
PLEASE PLEASE PLEASE, in order to not destroy the work I have done up
to now, please DON'T make changes to ChangeLog but instead tell me in
this message what should I do !
2010-01-20 14:28 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
and
2009-12-31
Hi,
1) hbtrace.c
only some changes to hbtrace are marked TOMERGE and so the marked
patches don't apply.
Can I use the TRUNK version ?
I think you can't. Several features were added
to this component, so it doesn't count as pure
bugfix. To avoid regressions, no new features
should be
Hi Mindaugas,
On 2010 Jan 23, at 01:32, Mindaugas Kavaliauskas wrote:
Hi,
francesco perillo wrote:
PLEASE PLEASE PLEASE, in order to not destroy the work I have done up
to now, please DON'T make changes to ChangeLog but instead tell me in
this message what should I do !
2010-01-20
On Sat, 23 Jan 2010, francesco perillo wrote:
Hi,
I proceeded with the merge work and I found some problems in the process...
[...]
PLEASE PLEASE PLEASE, in order to not destroy the work I have done up
to now, please DON'T make changes to ChangeLog but instead tell me in
this message what
14 matches
Mail list logo
