Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keep entry history when merging databases #970

Merged
merged 1 commit into from
Sep 23, 2017
Merged

Keep entry history when merging databases #970

merged 1 commit into from
Sep 23, 2017

Conversation

droidmonkey
Copy link
Member

Description

Fixes #965. Maintain entry history when merging databases.

Types of changes

  • ✅ Bug fix (non-breaking change which fixes an issue)

Checklist:

  • ✅ I have read the CONTRIBUTING document. [REQUIRED]
  • ✅ My code follows the code style of this project. [REQUIRED]
  • ✅ All new and existing tests passed. [REQUIRED]
  • ✅ I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]

@droidmonkey droidmonkey added this to the v2.2.1 milestone Sep 19, 2017
@droidmonkey droidmonkey requested a review from louib September 19, 2017 21:41
@droidmonkey droidmonkey changed the base branch from develop to release/2.2.1 September 19, 2017 21:41
@droidmonkey droidmonkey force-pushed the hotfix/merge-keep-history branch from 064b931 to d79da82 Compare September 20, 2017 02:36
@louib
Copy link
Member

louib commented Sep 23, 2017 •
edited
Loading

@droidmonkey this one is gonna be a pain to upport, because the merge tests were moved to a separate file. So, same problem as in #942 really. You could add the unit tests to a new PR to develop, and wait for the upport of 2.2.1 to be done before merging, or go ahead and add the unit tests during the conflict resolution of the upport. I think the former will be easier though.

My bad really, I did not expect that much bug fixes to be rolled out in 2.2.1 when I was working in the merge function on develop :/

@droidmonkey
Copy link
Member Author

Ohh... I will back off the tests on this PR (since we know they work) and move that commit to develop. I understand why you split your previous PR's now.

@droidmonkey droidmonkey force-pushed the hotfix/merge-keep-history branch from d79da82 to 9b59363 Compare September 23, 2017 16:11
@louib louib merged commit 4b6dbca into release/2.2.1 Sep 23, 2017
@TheZ3ro TheZ3ro deleted the hotfix/merge-keep-history branch September 23, 2017 16:43
droidmonkey added a commit that referenced this pull request Oct 1, 2017
@droidmonkey
Release 2.2.1
2bce9c8 
- Corrected multiple snap issues [#934, #1011]
- Corrected multiple custom icon issues [#708, #719, #994]
- Corrected multiple Yubikey issues [#880]
- Fixed single instance preventing load on occasion [#997]
- Keep entry history when merging databases [#970]
- Prevent data loss if passwords were mismatched [#1007]
- Fixed crash after merge [#941]
- Added configurable auto-type default delay [#703]
- Unlock database dialog window comes to front [#663]
- Translation and compiling fixes
@phoerious phoerious added pr: bugfix Pull request that fixes a bug and removed bug labels Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@louib louib louib approved these changes

@TheZ3ro TheZ3ro TheZ3ro approved these changes

Assignees
No one assigned
Labels
pr: bugfix Pull request that fixes a bug
Projects
None yet
Milestone
v2.2.1
Development

Successfully merging this pull request may close these issues.
4 participants
@droidmonkey @louib @TheZ3ro @phoerious