Michael Bolin a43eb5afaf Add proper support for the UNTRACKED_ADDED conflict type. ... Summary: If you have an untracked file and you `hg update` to a commit that has that file in the tracked state, then the contents of the untracked version should be ignored, as they are replaced with the contents of the file in the commit you are updating to. The untracked version should be backed up as specified by `ui.origbackuppath`. Previously, our code in `eden/hg/eden/__init__.py` mapped this to a merge action named `c`, but we did not include that in our set of `actions`, so we were getting a `KeyError` if you exercised this code path. I discovered this while trying to reproduce the issue that I fixed in D6199215. Reviewed By: simpkins Differential Revision: D6204916 fbshipit-source-id: b70153428291bda9a8853a37c0955ad7cb3bd89d		2017-11-07 17:50:52 -08:00
..
hg	Add proper support for the UNTRACKED_ADDED conflict type.	2017-11-07 17:50:52 -08:00
lib	Fix hg grep so it works when run from a subdirectory.	2017-09-13 12:57:40 -07:00
basic_test.py	add .eden "magic" dir	2017-03-24 23:07:42 -07:00
clone_test.py	Use a more direct stringification of an exception.	2017-10-31 17:06:08 -07:00
debug_getpath_test.py	Use a more direct stringification of an exception.	2017-10-31 17:06:08 -07:00
health_test.py	move integration tests to eden/integration	2017-01-31 14:41:14 -08:00
help_test.py	add test verifying eden help succeeds	2017-11-07 16:06:32 -08:00
hypothesis_simple_test.py	add .eden "magic" dir	2017-03-24 23:07:42 -07:00
info_test.py	fix a bug in bind mount shutdown	2017-03-20 22:11:19 -07:00
materialized_query_test.py	do a better job at reporting "new" in watchman results.	2017-08-11 12:57:37 -07:00
oexcl_test.py	move integration tests to eden/integration	2017-01-31 14:41:14 -08:00
rc_test.py	move eden/fs/cli to eden/cli	2017-04-14 11:39:01 -07:00
remount_test.py	Print a sensible error message when the user tries to mount an existing mount.	2017-10-31 17:06:08 -07:00
rename_test.py	add .eden "magic" dir	2017-03-24 23:07:42 -07:00
repo_test.py	move integration tests to eden/integration	2017-01-31 14:41:14 -08:00
sed_test.py	move integration tests to eden/integration	2017-01-31 14:41:14 -08:00
setattr_test.py	setting TimeStamps for TreeInode	2017-08-14 23:23:23 -07:00
TARGETS	don't run all integration tests in both build modes	2017-07-07 16:01:33 -07:00
thrift_test.py	Changes to return unloaded inode count for TreeInode::unloadChildrenNow	2017-08-22 19:50:00 -07:00
unixsocket_test.py	add basic mknod support	2017-03-30 23:53:05 -07:00
unlink_test.py	move integration tests to eden/integration	2017-01-31 14:41:14 -08:00
xattr_test.py	move integration tests to eden/integration	2017-01-31 14:41:14 -08:00