Scenario: a recursive pull, rebased
The recursive pull, with --rebase: the same tree, the
same upstreams, and the same two conflicts. pull --rebase --recursive
pulls at the last pull in the tree, with HEAD detached there, top-down
as without --rebase, and makes one commit of the pulls, p. Then it
rebases the monorepo's own commits since, here m1, onto p, once.
Rebasing onto each splice's pull instead would replay the pulls of the
splices above it too.
Output
setup.bash builds this state:
$ build_scenario scenario_recursive_pull
Each upstream moves on. b's changes the file.txt in its c/ too:
$ git clone -q https://git.example.com/c.git ../c-work &&
> echo "c upstream" >>../c-work/file.txt &&
> git -C ../c-work commit -q -am "c2: c upstream" &&
> git -C ../c-work push -q origin main
$ git clone -q https://git.example.com/b.git ../b-work &&
> echo "b upstream" >>../b-work/file.txt &&
> echo "c in b's upstream" >>../b-work/c/file.txt &&
> git -C ../b-work commit -q -am "b2: b upstream" &&
> git -C ../b-work push -q origin main
$ git clone -q https://git.example.com/d.git ../d-work &&
> echo "d upstream" >>../d-work/file.txt &&
> git -C ../d-work commit -q -am "d2: d upstream" &&
> git -C ../d-work push -q origin main
a's splices e in, in the same commit:
$ git clone -q https://git.example.com/a.git ../a-work &&
> cd ../a-work &&
> git splice clone https://git.example.com/e.git e &&
> echo "a upstream" >>file.txt &&
> git commit -q --amend -am "a2: a upstream, and e spliced in" &&
> git push -q origin main &&
> cd ../monorepo
=== e: fetching https://git.example.com/e.git
ok e: cloned ad47a17 from main
The monorepo changes vendor/a/ and, in it, b/:
$ echo "a in the monorepo" >>vendor/a/file.txt &&
> echo "b in the monorepo" >>vendor/a/b/notes.txt &&
> git add vendor/a &&
> git commit -q -m "m1: a and b in the monorepo"
Before the pull, m1 is on top of each splice it changed, as the copy m1', which the rebuild carries over:
The pull
c/ conflicts in its own pull, as a merge with what b's upstream has
in c/. The branch main is still at m1:
$ git splice pull --rebase --recursive vendor/a
ok vendor/a fetched (main moved 764d9c4..6d12ed8)
ok vendor/a/b fetched (main moved f815a3c..be68b59)
ok vendor/a/b/c fetched (main moved 8c169b6..94cad5e)
ok vendor/a/d fetched (main moved 2c64d15..36c850e)
ok vendor/a: pulled 6d12ed8
ok vendor/a/e fetched
ok vendor/a/e: nothing to pull
ok vendor/a/b: pulled be68b59
Auto-merging vendor/a/b/c/file.txt
CONFLICT (content): Merge conflict in vendor/a/b/c/file.txt
!! vendor/a/b/c: conflict -- resolve it, then 'git commit' (or 'git cherry-pick --abort' to give up)
!! vendor/a/b/c: pull failed
!! Not pulled yet: vendor/a/d -- resolve the conflict, run 'git commit', then re-run pull
!! Failed: vendor/a/b/c
!! The pulls are on a detached HEAD, 'main' is as it was -- re-run pull to go on, or 'git switch main' to give up
[1]
$ printf "c1: c seed\nc in b's upstream\nc upstream\n" >vendor/a/b/c/file.txt &&
> git add vendor/a/b/c/file.txt &&
> git commit -q --no-edit
The pulls are done, and make p. a's conflict comes up when m1 is
rebased onto it:
$ git splice pull --rebase --recursive vendor/a
ok vendor/a fetched
ok vendor/a/b fetched
ok vendor/a/b/c fetched
ok vendor/a/d fetched
ok vendor/a/e fetched
ok vendor/a: nothing to pull
ok vendor/a/b: nothing to pull
ok vendor/a/b/c: nothing to pull
ok vendor/a/d: pulled 36c850e
ok vendor/a/e: nothing to pull
ok vendor/a: 4 pulls made one commit, 4695060
Auto-merging vendor/a/file.txt
CONFLICT (content): Merge conflict in vendor/a/file.txt
error: could not apply 74d923b... m1: a and b in the monorepo
Could not apply 74d923b... # m1: a and b in the monorepo
!! conflict while rebasing onto the pull -- resolve it, then 'git rebase --continue' (or 'git rebase --abort' to give up)
[1]
$ printf 'a seed\na in the monorepo\na upstream\n' >vendor/a/file.txt &&
> git add vendor/a/file.txt &&
> git rebase --continue >/dev/null
$ git log --format=%s
m1: a and b in the monorepo
splice: pull vendor/a from main at 6d12ed8
add vendor/a
initial commit
