Modify setup.sh to allow updating #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks good to me. I also like the idea of inspecting pull requests and merging, rather than just directly modifying master. Also, if there's a cleaner way of doing this, it's not immediately obvious. |
mczwier
added a commit
that referenced
this pull request
Oct 5, 2014
Modify setup.sh to allow updating of subcomponents
KarlTDebiec
pushed a commit
to KarlTDebiec/westpa
that referenced
this pull request
Aug 19, 2015
integrated most remaining wiki pages into sphinx
ltchong
pushed a commit
that referenced
this pull request
May 6, 2020
Update repo to the latest py3 WESTPA
synapticarbors
pushed a commit
that referenced
this pull request
May 18, 2020
Update repo to the latest py3 WESTPA Former-commit-id: 17215f2
synapticarbors
pushed a commit
that referenced
this pull request
Jun 22, 2020
Update repo to the latest py3 WESTPA Former-commit-id: 17215f2
synapticarbors
referenced
this pull request
in synapticarbors/westpa
Jun 24, 2020
Modify setup.sh to allow updating of subcomponents Former-commit-id: 2acb000
synapticarbors
referenced
this pull request
in synapticarbors/westpa
Jun 24, 2020
integrated most remaining wiki pages into sphinx Former-commit-id: ef1c41a
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@mczwier: After looking at the new
setup.sh, I realized that if any of the former submodules were updated, that a novice user wouldn't have an easy path to updating the code. I changed things around so that if the directory containing the package doesn't exist, it's cloned, but otherwise the script does a pull to get any new changesets, and then updates to the revision specified by the script. This assumes that the changeset that we want lives inmasterand it's going to be merged intomaster, which is currently true but may not always be. I think this should be pretty safe, as I'm assuming the average user won't ever modify the code so uncommitted changes and merge conflicts won't happen. Developers should have a handle on the structure of the code and git that they'll know the correct path to take when making modifications.Now a user should be able to just run
setup.shto get current with the subrepos. Agit pull(orgit fetch/git merge) can be done to get the main repo at the newest revision as before.There may be a cleaner way of doing this.
Anyways, I thought I would kick off discussing code decisions in Github using the first PR for the repo. I think in general though, we should get in the habit of not always pushing directly to
masterso that some code review can take place.