working on svn / git interaction#1
Open
jedwards4b wants to merge 5 commits intoCESM-Development:masterfrom
Open
working on svn / git interaction#1jedwards4b wants to merge 5 commits intoCESM-Development:masterfrom
jedwards4b wants to merge 5 commits intoCESM-Development:masterfrom
Conversation
Experimenting with github workflow and adding some changes to make this functional. * cesm-dev/master: update README test commit via svn update to working branch
Contributor
|
Hi Jim, git subtree was added to standard git almost 3 years ago: http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/ Try loading a more recent git module. Ben |
Contributor
Author
|
I thought that it was working last week. Okay I've requested an update on yellowstone. |
Contributor
|
I see the addition of the svn externals file in your pull request, but don't see your makefile changes to use the externals file. Did you add it?. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Hi Ben,
I've made some changes that allow git to use the SVN_EXTERNAL_DIRECTORIES file
to get the repo and path information so that these things only need to be in one place.
But I'm confused by your git entries in the Makefile because git doesn't have a subtree subcommand. I'd like to understand what git needs to make this function.