Adam Simpkins 9980907d1e fix checkout to always report the specific list of files with conflicts ... Summary: This fixes the checkout code to always recurse into directories with conflicts, and accurately list all individual files with conflicts. Previously the checkout code always avoided recursing into unloaded directory inodes that were affected by the checkout. Since the inode was not loaded we can easily replace it without recursing into it. Unfortunately this resulted in an inaccurate conflict list--we would report the directory itself as a conflict. This is insufficient for our mercurial extension, which needs to know the specific list of files with conflicts, so it can ask mercurial to perform conflict resolution on them. Reviewed By: bolinfest Differential Revision: D4672373 fbshipit-source-id: ff400a4a6e25b8b0754c66cb067a69d553a5c98b		2017-03-09 20:57:27 -08:00
..
docs	implement EdenMount::checkout()	2017-02-15 20:33:31 -08:00
fs	fix checkout to always report the specific list of files with conflicts	2017-03-09 20:57:27 -08:00
fuse	get the open source build working	2017-03-06 20:28:48 -08:00
hooks	fixup paths used in post-clone and LameThriftClient	2017-01-23 23:54:38 -08:00
integration	remove getMaterializedEntries thrift API	2017-03-01 08:19:29 -08:00
utils	fix warnings triggered with -Wshadow-compatible-local	2017-03-02 13:32:51 -08:00
DEFS	fixup paths used in post-clone and LameThriftClient	2017-01-23 23:54:38 -08:00