Claude,
I think using "git rebase" rather than "git merge" would have made this
cleaner. Rebase undoes the differences, merges cleanly the other branch
(fast forward) then redoes the differences.
Andy
On 07/02/18 20:30, [email protected] wrote:
Merge branch 'master' into FixGraphContractTestTransactionUsage
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/567f4053
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/567f4053
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/567f4053
Branch: refs/heads/master
Commit: 567f40531b02ea4808a51837ae8005b98da76886
Parents: 02ae269 568b822
Author: Claude Warren <[email protected]>
Authored: Sun Feb 4 11:05:28 2018 +0000
Committer: Claude Warren <[email protected]>
Committed: Sun Feb 4 11:05:28 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RDFLanguages.java | 16 +++--
.../jena/sparql/algebra/table/TableBase.java | 2 +
.../jena/sparql/algebra/table/TableEmpty.java | 4 ++
.../jena/sparql/algebra/table/TableUnit.java | 9 ++-
.../sparql/graph/TransactionHandlerNull.java | 2 +-
.../jena/sparql/sse/writers/WriterOp.java | 9 ++-
.../java/org/apache/jena/riot/TestLangRIOT.java | 5 ++
.../apache/jena/sparql/algebra/TS_Algebra.java | 3 +-
.../jena/sparql/algebra/TestOpAsQuery.java | 26 +++++++-
.../apache/jena/sparql/algebra/TestTable.java | 68 ++++++++++++++++++++
.../algebra/optimize/TestTransformFilters.java | 2 +-
.../transaction/AbstractTestTransPromote.java | 26 ++++----
.../AbstractTestTransactionLifecycle.java | 24 ++++++-
.../main/java/org/apache/jena/tdb2/TDB2.java | 3 +
.../jena/tdb2/store/GraphViewSwitchable.java | 5 --
.../org/apache/jena/fuseki/async/AsyncPool.java | 25 +++++--
.../src/main/java/org/apache/jena/tdb/TDB.java | 3 +
.../jena/tdb/graph/TransactionHandlerTDB.java | 62 ------------------
.../apache/jena/tdb/store/GraphNonTxnTDB.java | 56 ++++++++++++----
.../tdb/transaction/TransactionManager.java | 59 ++++++++++-------
20 files changed, 269 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
