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

It would be nice if holo-files allowed fast-forwarding #24

Closed
LukeShu opened this issue Jan 24, 2017 · 2 comments
Closed

It would be nice if holo-files allowed fast-forwarding #24

LukeShu opened this issue Jan 24, 2017 · 2 comments

Comments

@LukeShu
Copy link
Contributor

LukeShu commented Jan 24, 2017

By that, I mean that if holo expects the file contents to be "bbb", and is planning on changing the contents to "ccc", but the file has already been externally changed to "ccc", then holo-files should see that and accept it quietly. Currently it requires --force, but ends up being a no-op (except for updating $HOLO_STATE_DIR/provisioned)

What I am proposing is similar to pacman's decision making with whether to create a .pacnew file.

majewsky added a commit that referenced this issue Jan 24, 2017
In order to untangle the mess that is Apply() to solve #24.
@majewsky
Copy link
Contributor

Here's me finally reacting to a bug report in due time. :)

@LukeShu Are you satisfied with the result? The holo diff in that testcase still shows a diff, but that's technically correct since man 8 holo describes holo diff as producing the diff "between the last provisioned version of each selected target file and the actual contents of the target file".

LukeShu pushed a commit to LukeShu/holo that referenced this issue Jan 24, 2017
LukeShu pushed a commit to LukeShu/holo that referenced this issue Jan 24, 2017
LukeShu pushed a commit to LukeShu/holo that referenced this issue Jan 24, 2017
LukeShu pushed a commit to LukeShu/holo that referenced this issue Jan 24, 2017
@LukeShu
Copy link
Contributor Author

LukeShu commented Jan 24, 2017

Yes, I'm satisfied. I'd also written a test (LukeShu@415e8ca). Mine does not use .pacnew. I'm not sure if it might be worth it to merge the testcases.

LukeShu pushed a commit to LukeShu/holo that referenced this issue Jan 25, 2017
LukeShu pushed a commit to LukeShu/holo that referenced this issue Jan 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants