mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
cf9cd619c1
Summary: This diff fills missing parts of push-rebase implementation - `find_closest_root` - find closest root to specified bookmark - `find_changed_files` - find file affected by changesets between provided `ancestor` and `descendant` - `intersect_changed_files` - rejects push rebase if any conflicts have been found - `create_rebased_changes` - support for merges - `do_pushrebase` - returns updated bookmark value Reviewed By: StanislavGlebik Differential Revision: D9458416 fbshipit-source-id: c0cb53773eba6e966f1a5928c43ebdec761a78d3 |
||
---|---|---|
.. | ||
third_party | ||
integration_runner.py | ||
library.sh | ||
test-apiserver.t | ||
test-blobimport-return-error.t | ||
test-bonsai-verify.t | ||
test-bookmark-race.t | ||
test-cache-warmup.t | ||
test-copyrenmame.t | ||
test-gettreepack.t | ||
test-infinitepush.t | ||
test-init.t | ||
test-large-path-and-content.t | ||
test-lookup.t | ||
test-push-bookmarks.t | ||
test-push-newblobimport.t | ||
test-push-protocol.t | ||
test-pushrebase.t | ||
testcert.crt | ||
testcert.key |