facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity
fe1a376e0f
sapling/eden/integration
History
Michael Bolin 1c695e6dc6 Fixed a bug in how we update the dirstate upon a snapshot change. 
Summary:
Previously, we were clearing entries in `hgDirstateTuples` for which:

```
mergeState == NotApplicable
```

but we should have been checking for:

```
mergeState == NotApplicable AND status == Normal
```

The previous logic was causing us to erroneously clear entries in a state like:

```
mergeState == NotApplicable AND status == MarkedForRemoval
```

This bug manifested itself when grafting a change that removed a file.
The file was removed from disk, but Eden did not know that it had been
`MarkedForRemoval`, so it would report the removed file as "missing" in
`hg status`.

Reviewed By: wez

Differential Revision: D5797270

fbshipit-source-id: 29740dfaa8102db868b95e932716773787f317ac
2017-09-08 19:25:34 -07:00
..
hg Fixed a bug in how we update the dirstate upon a snapshot change. 2017-09-08 19:25:34 -07:00
lib Fix for hg split in Eden. 2017-09-06 21:20:45 -07:00
basic_test.py add .eden "magic" dir 2017-03-24 23:07:42 -07:00
clone_test.py move integration tests to eden/integration 2017-01-31 14:41:14 -08:00
debug_getpath_test.py Add test to verify that eden debug getpath indicates when inodes are unloaded 2017-08-25 08:34:31 -07:00
debug_hg_get_dirstate_tuple_test.py Introduce eden debug hg_get_dirstate_tuple. 2017-08-18 21:49:59 -07:00
health_test.py move integration tests to eden/integration 2017-01-31 14:41:14 -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 add .eden "magic" dir 2017-03-24 23:07:42 -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