Scenario: feature-branch-from-main
The monorepo's main has a commit that upstream's main lacks, and the
monorepo is on a branch cut from it. Upstream protects its main, say, so
changes only go in through a PR from another branch.
- Monorepo (
vendor/a/): cloned atseedonmain, then a local commit, then the branchfeaturewithout further changes. - Upstream: only
main, atseed.
The splice didn't change on feature, but feature has a commit that
upstream's main lacks. That's what counts, as for a PR: push creates
feature upstream with it, ready for one (#150).
Output
setup.bash builds this state:
$ build_scenario scenario_feature_branch_from_main
$ git splice status
On branch feature
new, ahead 1 vendor/a push creates the branch
$ git splice log
=== vendor/a (upstream has no 'feature' branch -- compared with 'main')
< e859a6b local change (Test <test@example.com>)
$ git splice diff --stat
=== vendor/a
file.txt | 1 +
1 file changed, 1 insertion(+)
$ git splice push vendor/a
?? vendor/a: upstream has no 'feature' branch yet -- this push creates it
ok vendor/a: pushed e859a6b to feature
$ git splice status
On branch feature
up to date vendor/a