| commit | 3f1c4f474687039fc476e8aee4fb406d2d4ebf23 | |
| author | Stefan Dirix <st.dirix@gmail.com> | |
| Tue, 14 Oct 2014 18:23:19 +0000 (14 20:23 +0200) | ||
| committer | Stefan Dirix <st.dirix@gmail.com> | |
| Mon, 20 Oct 2014 15:50:51 +0000 (20 17:50 +0200) | ||
| tree | 62b7e331cced393ff66a709b30742c27043061ed | treesnapshot (tar.gz zip) |
| parent | 9669ed07ca022fb50539c672b48ba6eee7f4a6d9 | commitdiff |
[441172] Fix merge order of equivalent diffs for one-to-one opposites
When determining which one of the equivalent differences of one-to-one
eOpposites will be merged above the others, differences which result in
setting a feature value instead of unsetting a feature will be
preferred.
Includes testcases for both merge directions.
Bug: 441172
Signed-off-by: Stefan Dirix <st.dirix@gmail.com>
Change-Id: I2e98f44e5e440c82ec95135db622225c65dc07b3
When determining which one of the equivalent differences of one-to-one
eOpposites will be merged above the others, differences which result in
setting a feature value instead of unsetting a feature will be
preferred.
Includes testcases for both merge directions.
Bug: 441172
Signed-off-by: Stefan Dirix <st.dirix@gmail.com>
Change-Id: I2e98f44e5e440c82ec95135db622225c65dc07b3