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 [TOMERGE] was written and then removed... PLEASE don't do it again. If a file "file.prg" has a "complicated" history due to test with poor results there are two possibilities: keep the [TOMERGE] label on every revision on clearly say in the commit "take directly this revision dropping the history" actually collapsing several commits into one. Can I use the TRUNK version ? 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. 4) 2009-12-31 12:43 UTC+0100 Przemyslaw Czerpak it doesn't apply, but I need to investigate better (probably due to some missing previous codepage patches) Should all codepage rfelated patches be MERGED ? 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 ? 6) 2010-01-18 13:27 UTC+0100 mapi.c doesn't apply for different formatting.... no problem 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 ! 29 patches apply cleanly. Thank you Francesco _______________________________________________ Harbour mailing list (attachment size limit: 40KB) [email protected] http://lists.harbour-project.org/mailman/listinfo/harbour
