DESCRIPTION

[wip] Use a workspace-aware merging strategy when working from EGit

This introduces an Eclipse-specific sub-class of the
RecursiveMerger that will make use of the mergers provided
by ModelProviders instead of ignoring them to always use
EGit's custom merging algorithms.

Any file which does not have a specific merger (or which
merger cannot be found, such as for files outside of the
workspace) is still handled as it would by the
RecursiveMerger.

Change-Id: I1b27061ab215ebe600baef56f4e19a038c4b31a8
Also-by: Gustavo Green xxx@xxx.xxx
Also-by: Karter Mora xxx@xxx.xxx
Signed-off-by: Maleah Marks xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2015-04-01 14:25:42.000000000

Uploaded patch set 16.

-------------------------------------
author: Brenden Conley
date: 2015-04-01 14:26:44.000000000

Patch Set 16:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/6919/

-------------------------------------
author: Brenden Conley
date: 2015-04-01 14:27:35.000000000

Patch Set 16: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/6919/ : FAILURE

-------------------------------------
author: Douglas Trujillo
date: 2015-04-01 14:34:22.000000000

Patch Set 16:

- I think you were right and we have to use NameConflictTreeWalk
- simplified TreeWalkResourceVariantTreeProvider()
- use index constants made public in JGit change https://git.eclipse.org/r/#/c/44961/ this breaks the build until this jgit change is submitted
- minor formatting changes

I'll file a CQ for this change to get the IP review done (contribution is >1000 lines)

-------------------------------------
author: Douglas Trujillo
date: 2015-04-01 14:34:32.000000000

Patch Set 16: Code-Review+1

-------------------------------------
author: Douglas Trujillo
date: 2015-04-01 14:35:48.000000000

Patch Set 16: -Code-Review

forget what I said in my last comment, posted this on the wrong change

-------------------------------------
author: Maleah Marks
date: 2015-04-01 14:37:56.000000000

Patch Set 16:

Yes I had figured that out :)
Thank you anyway, i'm taking a look at your changes.

-------------------------------------
