DESCRIPTION

Don't display merge commit as conflicting

GitModelCommit.calculateKid() use right "left-right mode" described by
Yoselin Hanna[1] to calculate commit direction.

1. http://egit.eclipse.org/r/#patch,sidebyside,1358,2,/COMMIT_MSG

Bug: 322496
Bug: 323057
Change-Id: Ia304b382e476daad5e2db3c852d91985e0199b92
Signed-off-by: Leslie Stephenson xxx@xxx.xxx


COMMENTS

author: Leslie Stephenson
date: 2010-08-25 21:28:37.000000000

Uploaded patch set 4.

-------------------------------------
author: Leslie Stephenson
date: 2010-08-25 21:31:19.000000000

Patch Set 4: I would prefer that you didn't submit this

(1 inline comment)



Line:121, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelRepository.java -> Shawn, could you please look at this "left-right mode" implementation?

I don't know why it returns only one RevCommit that have local flag and one with remote flag.

-------------------------------------
author: Leslie Stephenson
date: 2010-08-26 19:55:02.000000000

Patch Set 4: (1 inline comment)



Line:121, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelRepository.java -> OK, I solve this problem. tw.carry(allFlags) is required when we want to mark all commits with given flag

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