16 Commits

Author SHA1 Message Date
Nick Hall
e7ca43f996 7584: Fix update of active object after merge 2014-04-05 19:08:30 +01:00
Michiel Nauta
d2ec6e9899 5467: Selected object after merger is not always merged object
svn: r18669
2011-12-31 18:47:05 +00:00
Tim G L Lyons
f8f510d5f1 Delete remove_source_references and replace_source_references as they are no longer needed.
Rename remove_citation to remove_citation_refs and make it apply to a citation_handle_list.
Updated tool/Check.py to change check_source_references into check_citation_references


svn: r18433
2011-11-11 17:12:43 +00:00
Tim G L Lyons
b4f434357f Remove has_source_reference because it is only used in mergesource, and it is better to make the test directly, because only citations have source references and they only have one reference.
svn: r18417
2011-11-08 17:39:17 +00:00
Tim G L Lyons
3adb1b7ffa Merged trunk r17888 through r18397 into geps023.
Conflicts resolved in:
    /data/grampsxml.dtd
    /data/grampsxml.rng
    /src/Filters/Rules/Repository/_MatchesNameSubstringOf.py
    /src/plugins/import/ImportXml.py
(Various property conflicts also resolved)

svn: r18405
2011-11-05 19:07:58 +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
Tim G L Lyons
5a3cef062c * Implemented merge Citation
* Updated merge Sources
* Implemented undo-redo for citations (revision 18069 had only added citations to the undo-redo list, not acted on that types of element)
* Fixed embedded lists for some of the object type editors that were done in Rev 18069
* Modified EditCitation so the source parameter is optional
* Added svn properties for all /src/Merge/merge*.py modules
* Added support for EditCitation from backreflist.py

svn: r18085
2011-08-30 10:40:30 +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