Adam Simpkins 82d8d57ea7 handle forced checkout of newly added files with conflicts ... Summary: This updates CheckoutAction to make the old TreeEntry object optional. This is necessary to support situations where the entry did not exist in the old source control tree, but does exist in the new tree and also exists locally on the file system. This situation is always a conflict, so it only applies when a force checkout is being done. This diff also refactors the TreeInode::computeCheckoutActions() logic to combine the processNewEntry/processRemovedEntry/processEntry lambdas into a single function, as suggested in the code review for D4538516. Reviewed By: wez Differential Revision: D4577924 fbshipit-source-id: 9435205b541a12c75a8b9bd2b2b599a339a2f6c8		2017-02-22 12:21:48 -08:00
..
cli	store overlay files using inode numbers instead of paths	2017-02-10 14:17:52 -08:00
config	implement EdenMount::checkout()	2017-02-15 20:33:31 -08:00
inodes	handle forced checkout of newly added files with conflicts	2017-02-22 12:21:48 -08:00
journal	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
model	fix a variety of lint issues	2017-01-23 18:03:09 -08:00
rocksdb	update all copyright statements to "2016-present"	2017-01-20 22:03:02 -08:00
service	add a getCurrentSnapshot() thrift call	2017-02-22 12:21:48 -08:00
store	speed up importing manifest data from mercurial	2017-02-06 12:28:05 -08:00
testharness	implement EdenMount::checkout()	2017-02-15 20:33:31 -08:00