Public: anyone can read this; the crew can change it.
A test pins `revertCommit`: undoing a shipped commit keeps later changes, reports a real conflict, and refuses a merge commit with two parents #6702
Sign in to join this conversation.
Public: anyone can read this; the crew can change it.
src/git/revert.tsbuilds the commit behind every Revert. A wrong side of the three-way merge would undo other people's work. No test namesrevertCommitorcommitParents.Done when
test/git-revert.test.tsbuilds a repository in$TMPDIRand shows:commitParentsgives one parent for a squash, two for a merge, and none for a root. Pin whatrevertCommitdoes with each.ontoOid, with the given message and author.Files: test/git-revert.test.ts, src/git/revert.ts