Hi Phil, Am Sonntag, den 02.12.2007, 16:29 -0500 schrieb Phil Longstaff: > Author: plongstaff > Date: 2007-12-02 16:29:35 -0500 (Sun, 02 Dec 2007) > Trac: http://svn.gnucash.org/trac/changeset/16612 > Log: > 1) Merge with trunk up to 16597 > 2) When inserting into a table which doesn't have a guid as the > primary > key (e.g. slots), where the first key is an auto-increment key, don't > provide a value for the key. > 3) Work on recurrences and scheduled transactions. They don't work > yet, > but the sx struct is saved
Please do not mix merges with actual work. This complicates the handling of that commit afterwards unnecessarily. I would even say that the merge A itself should only resolve physical conflicts, i.e. remove conflict markers correctly. Then a commit B could fix the branch to at least compile before adding anything new (C). For small changes A+B might go in together. But that is only my opinion. As your branch has seen several merges, the missing of .gitignore (see r16625) let me check the differences between [EMAIL PROTECTED] and gda-dev. The resulting diffstat can be found in the attachment (svn-property changes are not included). 267 files changed, 124643 insertions(+), 113859 deletions(-) That does not look completely right to me. [1] I do not know which merge failed, but I think it will be hard to merge your branch back to trunk at some point. It would be nice if you could take a look into this. My suggestion would be to create a new branch gda-dev2 [2], starting from current trunk and reapply your work. This also gives you the chance do some things differently in case you have always wanted to :-D Yours, -- andi5 [1] accounts/, packaging/, ChangeLog*, src/scm/process.scm to name a few [2] Just drop a note and it will be done.
ChangeLog | 9885 ++++++++ ChangeLog.2006-manual | 7689 ------ GDA_STATUS | 88 + accounts/fr_CA/Makefile | 547 + accounts/fr_CA/Makefile.in | 547 + accounts/zh_HK/acctchrt_business.gnucash-xea | 1413 -- accounts/zh_TW/acctchrt_business.gnucash-xea | 1413 -- configure.in | 31 +- contrib/pgsql-1.8-import/README | 19 - contrib/pgsql-1.8-import/gnc2sql.pl | 186 - contrib/pgsql-1.8-import/gnc2sql_update.pl | 157 - contrib/pgsql-1.8-import/gnctables.sql | 868 - doc/README.dependencies | 29 + gnucash-config.in | 214 + gnucash.m4 | 216 + goffice-config.h.in | 225 + goffice-features.h.in | 51 + gsf-config.h.in | 129 + packaging/win32/Greek-4-5.1.11.isl | 367 - packaging/win32/goffice-0.3.0-patch.diff | 189 + packaging/win32/goffice-0.3.2-patch.diff | 91 + packaging/win32/goffice-0.3.7-patch.diff | 91 + packaging/win32/goffice-0.4.1-patch.diff | 69 - packaging/win32/install-fq-mods.bat | 77 - packaging/win32/redirect.c | 166 - po/POTFILES.ignore | 5 - po/cs.po |24721 +++++++++++--------- po/de.po | 1006 +- po/glossary/de.po | 4 +- po/glossary/hu.po | 718 - po/glossary/zh_TW.po | 380 +- po/ja.po | 4413 +++-- po/pt_BR.po | 2742 ++-- po/zh_TW.po |11074 +++++----- src/backend/Makefile.am | 4 +- src/backend/file/Makefile.am | 75 - src/backend/file/gnc-account-xml-v2.c | 501 - src/backend/file/gnc-backend-file.c | 1074 - src/backend/file/gnc-backend-file.h | 62 - src/backend/file/gnc-book-xml-v2.c | 320 - src/backend/file/gnc-budget-xml-v2.c | 226 - src/backend/file/gnc-commodity-xml-v2.c | 296 - src/backend/file/gnc-freqspec-xml-v2.c | 489 - src/backend/file/gnc-lot-xml-v2.c | 202 - src/backend/file/gnc-pricedb-xml-v2.c | 469 - src/backend/file/gnc-recurrence-xml-v2.c | 127 - src/backend/file/gnc-schedxaction-xml-v2.c | 895 - src/backend/file/gnc-transaction-xml-v2.c | 649 - src/backend/file/gnc-xml-helper.h | 46 - src/backend/file/gnc-xml.h | 66 - src/backend/file/gncmod-backend-file.c | 65 - src/backend/file/io-example-account.c | 493 - src/backend/file/io-example-account.h | 58 - src/backend/file/io-gncxml-gen.c | 43 - src/backend/file/io-gncxml-gen.h | 48 - src/backend/file/io-gncxml-v1.c | 3779 --- src/backend/file/io-gncxml-v2.c | 1872 -- src/backend/file/io-gncxml-v2.h | 193 - src/backend/file/io-gncxml.h | 50 - src/backend/file/io-utils.c | 92 - src/backend/file/io-utils.h | 41 - src/backend/file/sixtp-dom-generators.c | 388 - src/backend/file/sixtp-dom-generators.h | 51 - src/backend/file/sixtp-dom-parsers.c | 864 - src/backend/file/sixtp-dom-parsers.h | 90 - src/backend/file/sixtp-parsers.h | 38 - src/backend/file/sixtp-stack.c | 189 - src/backend/file/sixtp-stack.h | 68 - src/backend/file/sixtp-to-dom-parser.c | 133 - src/backend/file/sixtp-utils.c | 876 - src/backend/file/sixtp-utils.h | 137 - src/backend/file/sixtp.c | 936 - src/backend/file/sixtp.h | 214 - src/backend/file/test/Makefile.am | 252 - src/backend/file/test/README | 18 - src/backend/file/test/grab-types.pl | 51 - src/backend/file/test/test-date-converting.c | 67 - src/backend/file/test/test-dom-converters1.c | 286 - src/backend/file/test/test-dom-parser1-1.xml | 14 - src/backend/file/test/test-dom-parser1.c | 73 - src/backend/file/test/test-file-stuff.c | 393 - src/backend/file/test/test-file-stuff.h | 42 - src/backend/file/test/test-files/Makefile.am | 1 - .../file/test/test-files/xml1/Money95bank_fr.gml | 4968 ---- .../file/test/test-files/xml1/Money95invst.gml | 321 - .../file/test/test-files/xml1/Money95mutual.gml | 174 - .../file/test/test-files/xml1/Money95stocks.gml | 866 - src/backend/file/test/test-files/xml1/abc.gml | 266 - src/backend/file/test/test-files/xml1/abcall.gml | 401 - .../file/test/test-files/xml1/carols-data-file | 1270 - .../file/test/test-files/xml1/carols-data-file.gml | 1270 - .../file/test/test-files/xml1/cbb-export.gml | 430 - src/backend/file/test/test-files/xml1/conrads-file | 449 - .../file/test/test-files/xml1/conrads-file.gml | 449 - src/backend/file/test/test-files/xml1/every.gml | 4760 ---- src/backend/file/test/test-files/xml1/ms-money.gml |10085 -------- src/backend/file/test/test-files/xml1/pricedb1.gml | 5361 ----- src/backend/file/test/test-files/xml2/Makefile.am | 15 - .../file/test/test-files/xml2/Money95bank_fr.gml2 | 4887 ---- .../file/test/test-files/xml2/Money95invst.gml2 | 352 - .../file/test/test-files/xml2/Money95mutual.gml2 | 193 - .../file/test/test-files/xml2/Money95stocks.gml2 | 904 - src/backend/file/test/test-files/xml2/abc.gml2 | 287 - src/backend/file/test/test-files/xml2/abcall.gml2 | 419 - .../test/test-files/xml2/carols-data-file.gml2 | 1194 - .../file/test/test-files/xml2/cbb-export.gml2 | 443 - .../file/test/test-files/xml2/conrads-file.gml2 | 464 - src/backend/file/test/test-files/xml2/every.gml2 | 4887 ---- .../file/test/test-files/xml2/goonies-file.gml2 | 228 - .../test-files/xml2/hierachical-data-file.gml2 | 322 - .../file/test/test-files/xml2/ms-money.gml2 |10047 -------- .../file/test/test-files/xml2/pricedb1.gml2 | 5361 ----- src/backend/file/test/test-kvp-frames.c | 225 - src/backend/file/test/test-load-backend.c | 45 - src/backend/file/test/test-load-example-account.c | 122 - src/backend/file/test/test-load-xml2.c | 151 - src/backend/file/test/test-real-data.sh | 28 - src/backend/file/test/test-save-in-lang.c | 196 - src/backend/file/test/test-string-converters.c | 112 - src/backend/file/test/test-xml-account.c | 373 - src/backend/file/test/test-xml-commodity.c | 245 - src/backend/file/test/test-xml-pricedb.c | 161 - src/backend/file/test/test-xml-transaction.c | 523 - src/backend/file/test/test-xml2-is-file.c | 30 - src/backend/gda/Makefile.am | 63 + src/backend/gda/gnc-account-gda.c | 339 + src/backend/gda/gnc-account-gda.h | 38 + src/backend/gda/gnc-backend-gda.c | 1066 + src/backend/gda/gnc-backend-gda.h | 81 + src/backend/gda/gnc-backend-util-gda.c | 1483 ++ src/backend/gda/gnc-backend-util-gda.h | 158 + src/backend/gda/gnc-book-gda.c | 217 + src/backend/gda/gnc-book-gda.h | 37 + src/backend/gda/gnc-budget-gda.c | 160 + src/backend/gda/gnc-budget-gda.h | 38 + src/backend/gda/gnc-commodity-gda.c | 222 + src/backend/gda/gnc-commodity-gda.h | 38 + src/backend/gda/gnc-lots-gda.c | 182 + src/backend/gda/gnc-lots-gda.h | 37 + src/backend/gda/gnc-price-gda.c | 239 + src/backend/gda/gnc-price-gda.h | 38 + src/backend/gda/gnc-recurrence-gda.c | 350 + src/backend/gda/gnc-recurrence-gda.h | 43 + src/backend/gda/gnc-schedxaction-gda.c | 244 + src/backend/gda/gnc-schedxaction-gda.h | 38 + src/backend/gda/gnc-slots-gda.c | 467 + src/backend/gda/gnc-slots-gda.h | 41 + src/backend/gda/gnc-transaction-gda.c | 903 + src/backend/gda/gnc-transaction-gda.h | 43 + src/backend/gda/gncmod-backend-gda.c | 63 + src/backend/postgres/test/Makefile.am | 2 +- src/backend/xml/Makefile.am | 75 + src/backend/xml/gnc-account-xml-v2.c | 501 + src/backend/xml/gnc-backend-xml.c | 1089 + src/backend/xml/gnc-backend-xml.h | 62 + src/backend/xml/gnc-book-xml-v2.c | 320 + src/backend/xml/gnc-budget-xml-v2.c | 226 + src/backend/xml/gnc-commodity-xml-v2.c | 296 + src/backend/xml/gnc-freqspec-xml-v2.c | 489 + src/backend/xml/gnc-lot-xml-v2.c | 202 + src/backend/xml/gnc-pricedb-xml-v2.c | 469 + src/backend/xml/gnc-recurrence-xml-v2.c | 127 + src/backend/xml/gnc-schedxaction-xml-v2.c | 895 + src/backend/xml/gnc-transaction-xml-v2.c | 649 + src/backend/xml/gnc-xml-helper.h | 46 + src/backend/xml/gnc-xml.h | 66 + src/backend/xml/gncmod-backend-xml.c | 65 + src/backend/xml/io-example-account.c | 493 + src/backend/xml/io-example-account.h | 58 + src/backend/xml/io-gncxml-gen.c | 43 + src/backend/xml/io-gncxml-gen.h | 48 + src/backend/xml/io-gncxml-v1.c | 3779 +++ src/backend/xml/io-gncxml-v2.c | 1872 ++ src/backend/xml/io-gncxml-v2.h | 193 + src/backend/xml/io-gncxml.h | 50 + src/backend/xml/io-utils.c | 92 + src/backend/xml/io-utils.h | 41 + src/backend/xml/sixtp-dom-generators.c | 388 + src/backend/xml/sixtp-dom-generators.h | 51 + src/backend/xml/sixtp-dom-parsers.c | 864 + src/backend/xml/sixtp-dom-parsers.h | 90 + src/backend/xml/sixtp-parsers.h | 38 + src/backend/xml/sixtp-stack.c | 189 + src/backend/xml/sixtp-stack.h | 68 + src/backend/xml/sixtp-to-dom-parser.c | 133 + src/backend/xml/sixtp-utils.c | 876 + src/backend/xml/sixtp-utils.h | 137 + src/backend/xml/sixtp.c | 936 + src/backend/xml/sixtp.h | 214 + src/backend/xml/test/Makefile.am | 252 + src/backend/xml/test/README | 18 + src/backend/xml/test/grab-types.pl | 51 + src/backend/xml/test/test-date-converting.c | 67 + src/backend/xml/test/test-dom-converters1.c | 286 + src/backend/xml/test/test-dom-parser1-1.xml | 14 + src/backend/xml/test/test-dom-parser1.c | 73 + src/backend/xml/test/test-file-stuff.c | 393 + src/backend/xml/test/test-file-stuff.h | 42 + src/backend/xml/test/test-files/Makefile.am | 1 + .../xml/test/test-files/xml1/Money95bank_fr.gml | 4968 ++++ .../xml/test/test-files/xml1/Money95invst.gml | 321 + .../xml/test/test-files/xml1/Money95mutual.gml | 174 + .../xml/test/test-files/xml1/Money95stocks.gml | 866 + src/backend/xml/test/test-files/xml1/abc.gml | 266 + src/backend/xml/test/test-files/xml1/abcall.gml | 401 + .../xml/test/test-files/xml1/carols-data-file | 1270 + .../xml/test/test-files/xml1/carols-data-file.gml | 1270 + .../xml/test/test-files/xml1/cbb-export.gml | 430 + src/backend/xml/test/test-files/xml1/conrads-file | 449 + .../xml/test/test-files/xml1/conrads-file.gml | 449 + src/backend/xml/test/test-files/xml1/every.gml | 4760 ++++ src/backend/xml/test/test-files/xml1/ms-money.gml |10085 ++++++++ src/backend/xml/test/test-files/xml1/pricedb1.gml | 5361 +++++ src/backend/xml/test/test-files/xml2/Makefile.am | 15 + .../xml/test/test-files/xml2/Money95bank_fr.gml2 | 4887 ++++ .../xml/test/test-files/xml2/Money95invst.gml2 | 352 + .../xml/test/test-files/xml2/Money95mutual.gml2 | 193 + .../xml/test/test-files/xml2/Money95stocks.gml2 | 904 + src/backend/xml/test/test-files/xml2/abc.gml2 | 287 + src/backend/xml/test/test-files/xml2/abcall.gml2 | 419 + .../xml/test/test-files/xml2/carols-data-file.gml2 | 1194 + .../xml/test/test-files/xml2/cbb-export.gml2 | 443 + .../xml/test/test-files/xml2/conrads-file.gml2 | 464 + src/backend/xml/test/test-files/xml2/every.gml2 | 4887 ++++ .../xml/test/test-files/xml2/goonies-file.gml2 | 228 + .../test-files/xml2/hierachical-data-file.gml2 | 322 + src/backend/xml/test/test-files/xml2/ms-money.gml2 |10047 ++++++++ src/backend/xml/test/test-files/xml2/pricedb1.gml2 | 5361 +++++ src/backend/xml/test/test-kvp-frames.c | 225 + src/backend/xml/test/test-load-backend.c | 45 + src/backend/xml/test/test-load-example-account.c | 122 + src/backend/xml/test/test-load-xml2.c | 151 + src/backend/xml/test/test-real-data.sh | 28 + src/backend/xml/test/test-save-in-lang.c | 196 + src/backend/xml/test/test-string-converters.c | 112 + src/backend/xml/test/test-xml-account.c | 373 + src/backend/xml/test/test-xml-commodity.c | 245 + src/backend/xml/test/test-xml-pricedb.c | 161 + src/backend/xml/test/test-xml-transaction.c | 523 + src/backend/xml/test/test-xml2-is-file.c | 30 + src/bin/Makefile.am | 19 +- src/bin/gnucash-gdb.in | 32 + src/business/business-core/file/Makefile.am | 14 +- .../file/gncmod-business-backend-file.c | 112 - .../file/gncmod-business-backend-xml.c | 112 + src/engine/SX-book.c | 15 +- src/engine/SX-book.h | 2 +- src/engine/SchedXaction.c | 2 + src/engine/gnc-book.h | 3 - src/engine/gnc-engine.c | 7 +- src/engine/gnc-filepath-utils.c | 8 + src/experimental/cgi-bin/Makefile.am | 2 +- src/gnome-utils/Makefile.am | 4 +- src/gnome-utils/druid-gnc-xml-import.c | 2 +- src/gnome-utils/gnc-file.c | 46 + src/gnome-utils/gnc-file.h | 1 + src/gnome-utils/test/Makefile.am | 2 +- src/gnome/Makefile.am | 4 +- src/gnome/dialog-sx-editor.c | 4 + src/gnome/gnc-plugin-basic-commands.c | 20 +- src/gnome/ui/gnc-plugin-basic-commands-ui.xml | 1 + src/import-export/qif-io-core/test/Makefile.am | 2 +- src/import-export/test/Makefile.am | 2 +- src/pixmaps/gnucash-icon.ico | Bin 7406 -> 8522 bytes src/report/report-gnome/test/Makefile.am | 2 +- src/report/stylesheets/test/Makefile.am | 2 +- src/scm/process.scm | 221 + 267 files changed, 124643 insertions(+), 113859 deletions(-)
_______________________________________________ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
