facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity
b02e32e02e
sapling/bundle2_resolver
History
Stanislau Hlebik d4e93edae5 mononoke: add copy/rename sources to list of conflict files in pushrebase 
Summary:
Copy & rename sources must be included in the list of conflict files so that if
a copy was modified between root and `onto` bookmark then pushrebase should
fail with conflicts.

Note that some some merge cases are not handled yet - see TODO in the code

Reviewed By: lukaspiatkowski

Differential Revision: D14322036

fbshipit-source-id: d69bcceaa24987dd1e9d67e77f6a3205b580a7d8
2019-03-11 05:18:31 -07:00
..
pushrebase/src mononoke: add copy/rename sources to list of conflict files in pushrebase 2019-03-11 05:18:31 -07:00
src mononoke: rename crates to contain underscores instead of dashes 2019-03-06 07:18:28 -08:00
wirepack/src mononoke: rename crates to contain underscores instead of dashes 2019-03-06 07:18:28 -08:00
Cargo.toml mononoke: rename crates to contain underscores instead of dashes 2019-03-06 07:18:28 -08:00