The Wayback Machine - https://web.archive.org/web/20201128145836/https://github.com/versionpress/versionpress/pull/1391
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.

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

Add go version merge driver #1391

Open
wants to merge 11 commits into
base: master
from
Open

Conversation

@abtris
Copy link

@abtris abtris commented Mar 9, 2019

Resolves #736

This is naive implementation php version in go lang.

I try tested using my test repository but getting this error:

2019/03/09 07:06:28 Command finished with error: exec: "git merge-file -L mine -L base -L theirs .merge_file_TO39EH .merge_file_OCO0Kc .merge_file_TXE15j": executable file not found in $PATH

I added lookPath part if is problem with git or binary ini-merge but don't find problem.

@borekb
Copy link
Member

@borekb borekb commented Mar 14, 2019

👋 @abtris, thanks for the PR! @JanVoracek will be looking at this later this week, quick notes from yesterday:

  • The driver will probably be best managed as a separate project in this repo, outside of plugins/versionpress/src. There'll need to be a dev setup, compilation instructions, updated build script, etc.
  • Isolated tests would be tricky, we might be happy enough exercising the driver as part of our full test suite.
  • Would CI be building the driver?
  • All files are loaded in memory by the current implementation, this should be converted to streaming.
@abtris
Copy link
Author

@abtris abtris commented Mar 14, 2019

I agree separate repo is good idea. Github Action or CI can build with goreleaser. Before we change implementation I will go with benchmark.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.