RFE: Add 3-way merge

[wcooley]

I am currently using the old pwsafe CLI (from http://sf.net/projects/pwsafe) with version control and a wrapper script to maintain a shared repository of passwords with my team of sys admins. The CLI supports 2-way merging with interactive confirmation, which results in an almost-workable solution, but in order to be really seamless 3-way merge is needed: Then it could be used as a custom/external diff3/merge with most of the
major SCMs. (Interactive merging for conflict resolution would be nice too.)

[ronys]

This should be a feature request on the SF project (https://sourceforge.net/p/passwordsafe/feature-requests/new/), no?

[wcooley]

I'm not sure; I thought at first that this project was independent of the official Password Safe project, but now I see that you are actually the developer there too. I am specifically interested in the pypwsafe library and CLI, as I have personal and in-house skills with Python and would be in a better position to support & contribute.

I'm also looking at the code and attempting to do it myself; I usually start an issue to refer to in my pull requests.

I don't see anything specific to pypwsafe in the SF bug tracker; do you want me to file my request there and just include in the text that I am asking for a pypwsafe enhancement?

[ronys]

This project is independent of pwsafe on SourceForge. Gpmidi asked me to administer this project, but as you can see he's the main contributor.
If you're interested in this project, great. What confused me was the pwsafe also has a cli mode that's pretty undeveloped.
Bottom line: You're welcome to contribute to either project.

Thanks,

Rony

[gpmidi]

If you're interested in contributing, we would be more than happy to receive any pull requests.

The CLI included with PyPWSafe was originally intended to be an example of how to use the library. It has however grown into both a way of "dumping" a psafe to stdout or a file (for testing of PyPWSafe ) and as a useful interface, within limits.

Depending on your needs, you may also be interested in PyPWSafe-Web. It's still in an alpha-level state, but does provide basic read/write access to multiple psafe files via XML-RPC. RAM-only caching is also included.