Summary: | "Merge Entries" complains about identical values | ||
---|---|---|---|
Product: | [Applications] tellico | Reporter: | Ph. Marek <philipp> |
Component: | general | Assignee: | Robby Stephenson <robby> |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | 2.3.4 | ||
Target Milestone: | --- | ||
Platform: | Debian testing | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | 2.3.5 |
Description
Ph. Marek
2011-12-19 10:13:31 UTC
Git commit 7b3b8ce99c69f2c691d675b52fe72692dacfc4a4 by Robby Stephenson. Committed on 27/12/2011 at 04:15. Pushed by rstephenson into branch '2.3'. Ignore conflicting entry IDs when merging entries Do not checking entry ID or creation/modification date when comparing entries to merge them. Use the return value from the comparison correctly. Check to see if the dialog has been cancelled. Related: bug 289346 FIXED-IN: 2.3.5 M +6 -0 ChangeLog M +21 -1 src/commands/updateentries.cpp M +25 -17 src/document.cpp M +1 -1 src/document.h M +11 -5 src/entrymerger.cpp M +1 -1 src/entryupdatejob.cpp M +53 -0 src/tests/collectiontest.cpp http://commits.kde.org/tellico/7b3b8ce99c69f2c691d675b52fe72692dacfc4a4 Git commit d2caad4b24006753fafb71d550e82f14e39a3a8d by Robby Stephenson. Committed on 27/12/2011 at 04:15. Pushed by rstephenson into branch 'master'. Ignore conflicting entry IDs when merging entries Do not checking entry ID or creation/modification date when comparing entries to merge them. Use the return value from the comparison correctly. Check to see if the dialog has been cancelled. Related: bug 289346 FIXED-IN: 2.3.5 M +6 -0 ChangeLog M +21 -1 src/commands/updateentries.cpp M +25 -17 src/document.cpp M +1 -1 src/document.h M +11 -5 src/entrymerger.cpp M +1 -1 src/entryupdatejob.cpp M +53 -0 src/tests/collectiontest.cpp http://commits.kde.org/tellico/d2caad4b24006753fafb71d550e82f14e39a3a8d |