11 Commits

Author SHA1 Message Date
Michiel Nauta
d2ec6e9899 5467: Selected object after merger is not always merged object
svn: r18669
2011-12-31 18:47:05 +00:00
Paul Franklin
331c135235 5128: Python files with no SVN "Id" property (& added MIME text/plain if none)
svn: r18338
2011-10-16 20:21:22 +00:00
Michiel Nauta
b46a74df36 5109: Error when merging duplicate records
svn: r18012
2011-08-08 21:04:03 +00:00
Michiel Nauta
a2028ba0f6 Speedup merging
svn: r17146
2011-04-18 21:09:49 +00:00
Michiel Nauta
5dadd0c866 Commit phoenix asap to fix a bug and simplify code in merge code
svn: r16937
2011-03-26 18:51:29 +00:00
Benny Malengier
752d594571 4198: Person view does not remove a row correctly when two people are merged.
This patch improves on the context changes:
 * avoid use of transaction_xx methods
 * force an abort in case of unclean transaction

Backward compatibility is broken to achieve this.


svn: r16680
2011-02-20 10:52:06 +00:00
Benny Malengier
6d596ad987 4198: Person view does not remove a row correctly when two people are merged.
This is a major patch by Michael Nauta. It means all writes happen immediately to bsddb, and the bsddb 
rollback is used on a crash. Transaction is no longer used to store changes and do them on commit.
Undo database is set on end. 
At the same time with statement is used throughout for transactions
At the same time, the original bug in merge code should be fixed
Still some issues, that will be ironed out


svn: r16523
2011-01-31 21:54:58 +00:00
Nick Hall
fd00d8c6e1 Remove rebuilds from merges that do not use batch transactions
svn: r16097
2010-11-01 12:00:26 +00:00
Doug Blank
afefbad431 4198: Person view does not remove a row correctly when two people are merged.
svn: r16069
2010-10-28 13:33:29 +00:00
Doug Blank
e3fdeb363d Add property keywords; removed unneeded files after merge fixes (#2059)
svn: r16059
2010-10-26 10:49:11 +00:00
Doug Blank
3e28ee67ec 2059: need a way to compare and merge all objects, by MD Nauta
svn: r15645
2010-07-22 02:16:32 +00:00