Skip to content

docs(design): consolidate VCS integration and weak parents - #504

Draft
roschaefer wants to merge 1 commit into
mainfrom
docs/vcs-weak-parents
Draft

roschaefer wants to merge 1 commit into
mainfrom
docs/vcs-weak-parents

Conversation

@roschaefer

@roschaefer roschaefer commented Nov 16, 2026 •

Copy link
Copy Markdown
Owner

Jujutsu and Sapling share branch-selection and working-copy questions, while the weak-parent discussion mixes provenance design with Git rewrite behavior. Explain the shared integration questions together, focus weak parents on provenance versus file history, and keep rewrite behavior with the Sapling metadata scenario.

Sapling sync-record import must reject nonempty source folders because .splice cannot preserve the upstream source path.

Follows #501, now merged. This PR contains only the remaining VCS and weak-parent changes.

Validation: the documentation production build and link checks passed before rebasing. The rebase onto main preserves the patch unchanged; git diff --check passes. Executable scenario examples are unchanged.

@coderabbitai

coderabbitai Bot commented Nov 16, 2026 •

Copy link
Copy Markdown

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 20 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: fe6e4616-df97-4e37-ae92-515df419b960
Commits

Reviewing files that changed from the base of the PR and between 69634de and 4421ac3.

Files selected for processing: 8

  • docs/05-comparisons/03-vcs/01-sapling.md
  • docs/05-comparisons/03-vcs/02-jj.md
  • docs/07-design/07-going-forward/03-git-compatible-vcs.md
  • docs/07-design/07-going-forward/03-jj.md
  • docs/07-design/07-going-forward/04-sapling.md
  • docs/07-design/07-going-forward/05-weak-parents.md
  • docs/07-design/07-going-forward/README.md
  • docs/09-scenarios/09-vcs-compatibility/01-sapling-metadata/README.md
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@roschaefer
roschaefer force-pushed the docs/vcs-weak-parents branch from 5862b99 to f4525f9 Compare November 16, 2026 17:40
@roschaefer
roschaefer force-pushed the docs/simplify-going-forward branch from 3e0c0a6 to 796bea7 Compare November 16, 2026 17:47
Base automatically changed from docs/simplify-going-forward to main November 16, 2026 18:01
Explain the shared branch and working-copy questions for Jujutsu and Sapling together. Reject source-folder records in the import proposal because the splice format cannot preserve them. Keep Git rewrite behavior with the scenario and focus weak parents on file history versus provenance.
@roschaefer
roschaefer force-pushed the docs/vcs-weak-parents branch from f4525f9 to 4421ac3 Compare November 16, 2026 18:07

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant