DESCRIPTION

Cherry-pick with conflicts must not change author ident

If cherry-pick stops with conflicts author ident must not be changed
when committing resolved conflicts.

Bug: 413043
Change-Id: I48b8355939022265b9041da018131a1fad1f2366
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2013-09-25 22:36:52.000000000

Uploaded patch set 2.

-------------------------------------
author: Danika Greer
date: 2013-09-25 22:44:04.000000000

Patch Set 2:

(1 comment)

Line:313, org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java -> Does the RevWalk have to be released? (I'm not sure if it's necessary in this case).

-------------------------------------
author: Brenden Conley
date: 2013-09-25 22:53:29.000000000

Patch Set 2:

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/211/

-------------------------------------
author: Douglas Trujillo
date: 2013-09-25 22:58:48.000000000

Patch Set 2:

(1 comment)

Line:313, org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java -> I think this isn't necessary since we don't intend to reuse it

-------------------------------------
author: Brenden Conley
date: 2013-09-25 23:09:38.000000000

Patch Set 2: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/211/ : UNSTABLE

-------------------------------------
author: Danika Greer
date: 2013-09-26 10:42:05.000000000

Patch Set 2:

(1 comment)

Line:313, org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java -> Looking at the calls of release in the code base, there are many places where it is released even though it isn't reused. Are all these calls really unnecessary?

-------------------------------------
author: Douglas Trujillo
date: 2013-09-26 13:52:05.000000000

Patch Set 2:

(1 comment)

Line:313, org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java -> fixed in new patchset

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