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

Fix jail update with patch: #317

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

rbgarga
Copy link
Member

@rbgarga rbgarga commented May 21, 2015

Revert previously applied patch and remove orphan files before attempt
to run 'svn up'. Otherwise conflicts can break src.

Reapply patch after update src.

Revert previously applied patch and remove orphan files before attempt
to run 'svn up'. Otherwise conflicts can break src.

Reapply patch after update src.
@bdrewery
Copy link
Member

I'm still a bit nervous about putting this change in. I think we might cause unexpected problems by always reverting before an update. Someone might purposely have their own customizations in the tree that they could lose here silently.

Plus it might make more sense to generalize this and have the entire jail rolled back to the "clean" snapshot before upgrade.

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

Successfully merging this pull request may close these issues.

2 participants