MonetDB: default - fix merge conflict in 0a8d1af0c436

2024-05-31 Thread Yunus Koning via checkin-list
Changeset: 3f4c730fed75 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/3f4c730fed75 Modified Files: sql/backends/monet5/sql_upgrades.c Branch: default Log Message: fix merge conflict in 0a8d1af0c436 diffs (135 lines): diff --git a/sql/backends/monet5/sql_upgrades.c b/sql/backe

MonetDB: default - Fix merge.

2023-03-31 Thread Sjoerd Mullender
Changeset: a7255d87ab66 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a7255d87ab66 Modified Files: monetdb5/optimizer/opt_pipes.c Branch: default Log Message: Fix merge. diffs (13 lines): diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c --- a/monetd

MonetDB: default - Fix merge.

2022-06-21 Thread Sjoerd Mullender
Changeset: 33e053ea1086 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/33e053ea1086 Modified Files: gdk/gdk_bbp.c Branch: default Log Message: Fix merge. diffs (12 lines): diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -2879,8 +2879,6 @@ d

MonetDB: default - Fix merge.

2022-03-17 Thread Sjoerd Mullender
Changeset: 8ce8461791be for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/8ce8461791be Modified Files: gdk/gdk_bat.c gdk/gdk_private.h Branch: default Log Message: Fix merge. diffs (61 lines): diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat

MonetDB: default - Fix merge: make white space equal.

2022-03-04 Thread Sjoerd Mullender
Changeset: 91024b6beb86 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/91024b6beb86 Modified Files: gdk/gdk_calc_private.h Branch: default Log Message: Fix merge: make white space equal. diffs (31 lines): diff --git a/gdk/gdk_calc_private.h b/gdk/gdk_calc_private.h --- a/gdk/gd

MonetDB: default - Fix merge changeset 61310c2fc0e0.

2020-01-30 Thread Sjoerd Mullender
Changeset: d2d17f818097 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2d17f818097 Modified Files: MonetDB.spec monetdb5/modules/mal/mal_mapi.c Branch: default Log Message: Fix merge changeset 61310c2fc0e0. diffs (28 lines): diff --git a/MonetDB.spec b/M

MonetDB: default - Fix merge.

2019-07-15 Thread Sjoerd Mullender
Changeset: 8f0d5335359f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f0d5335359f Modified Files: sql/backends/monet5/sql_scenario.c Branch: default Log Message: Fix merge. diffs (12 lines): diff --git a/sql/backends/monet5/sql_scenario.c b/sql/backends/monet5

MonetDB: default - Fix merge with Jul2015 branch.

2016-01-12 Thread Sjoerd Mullender
Changeset: d23af2f0ec20 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d23af2f0ec20 Modified Files: gdk/gdk_bat.c Branch: default Log Message: Fix merge with Jul2015 branch. diffs (71 lines): diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk

MonetDB: default - Fix merge in changeset d64001b5d7de, reinstat...

2015-12-08 Thread Sjoerd Mullender
Changeset: 2910fb63a312 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2910fb63a312 Modified Files: clients/mapilib/mapi.c Branch: default Log Message: Fix merge in changeset d64001b5d7de, reinstating changeset 1c398dba145e. diffs (truncated from 1051 to 300 lines)

MonetDB: default - Fix merge.

2015-11-03 Thread Sjoerd Mullender
Changeset: 2d529f962e90 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d529f962e90 Modified Files: clients/Tests/SQL-dump.stable.out Branch: default Log Message: Fix merge. diffs (11 lines): diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump

MonetDB: default - Fix merge for hge type.

2014-10-22 Thread Sjoerd Mullender
Changeset: af63f1c45cd4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af63f1c45cd4 Modified Files: gdk/gdk_firstn.c Branch: default Log Message: Fix merge for hge type. diffs (21 lines): diff --git a/gdk/gdk_firstn.c b/gdk/gdk_firstn.c --- a/gdk/gdk_firstn.c +++

MonetDB: default - Fix merge error in changeset 07489aec0ecc.

2014-08-25 Thread Sjoerd Mullender
Changeset: af1cd803b713 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af1cd803b713 Modified Files: gdk/gdk_calc.c Branch: default Log Message: Fix merge error in changeset 07489aec0ecc. diffs (14 lines): diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c --- a/gdk/gdk_

MonetDB: default - Fix merge.

2013-02-26 Thread Sjoerd Mullender
Changeset: 99dc55655aff for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99dc55655aff Modified Files: monetdb5/mal/mal_dataflow.c Branch: default Log Message: Fix merge. diffs (12 lines): diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c --- a/m

MonetDB: default - Fix merge of changeset 3f39e456a5e8 into defa...

2012-05-16 Thread Sjoerd Mullender
Changeset: 6f9a364e27af for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f9a364e27af Modified Files: monetdb5/mal/mal_profiler.h Branch: default Log Message: Fix merge of changeset 3f39e456a5e8 into default branch. The file mal_profile.h was not updated after mal_prof

MonetDB: default - Fix merge errors.

2011-08-02 Thread Sjoerd Mullender
Changeset: 81f4887cc998 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81f4887cc998 Modified Files: monetdb5/mal/mal_interpreter.mx monetdb5/optimizer/opt_partition.mx monetdb5/scheduler/run_centipede.mx Branch: default Log Message: Fix merge errors.