mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
f29792433d
Summary: When syncing merge commits with two parents it would be nice if it was the first parent that comes from the unified branch. In **case of octopus merges** we really don't want the parent in unified branch to be third (that would turn the sync into non-forward move!). Let's add a way to tell the commit rewriter which parent needs to be first. Reviewed By: farnz Differential Revision: D28885488 fbshipit-source-id: 57a081ce2d285ba2b6d6d98110cd1c64a241548e |
||
|---|---|---|
| .. | ||
| async_requests | ||
| async_requests_worker | ||
| commit_transformation | ||
| configo_client | ||
| if | ||
| mapping | ||
| megarepo_config | ||
| megarepo_error | ||
| requests_table | ||
| src | ||
| Cargo.toml | ||