Ingy döt Net
Ingy döt Net
Can you target this PR against master? The `release/0.4.0` branch has now been merged.
@grimmySwe has had his hands more dirty in subrepo lately. Thoughts on this?
When I started reading this just now, I immediately came up with the same strawman idea that @grimmySwe did. Keep an exclusion list of commits to prevent going upstream. The...
See also #64.
@tdd, now that #118 and #119 are addressed, where do we stand with this? ie #116
@tdd, that's wonderful. Thank you. Please continue helping us make subrepo everything you need for this stuff.
I'll talk to @admorgan about it soon.
@grimmySwe, `git subrepo -b -f` is effectively a cherry-pick replacement. Without `-f` it requires some kind of merge logic. I think `-b ... -f` is cool because you can try...
@perlpunk's repo still causes failure: ``` % mv .git .git.bak % make test ```
This patch might do the trick: ``` diff --git a/test/setup b/test/setup index fc19786..bfe7667 100644 --- a/test/setup +++ b/test/setup @@ -8,6 +8,10 @@ set -e # Set the GIT_SUBREPO_ROOT for testing....