DESCRIPTION

Fix error message when rebasing non workspace files

Conflicts in non workspace files resulted in a strange error message
when opening the merge tool: "Resources belong to different
Repositories". Now the rebase result dialog detects the problem in
advance and gived the user hints how to continue.

Bug: 346340
Change-Id: I728358b596c0c020b532a37a0988f7c19d9ee3fb
Signed-off-by: Marlie Beasley xxx@xxx.xxx

COMMENTS

author: Brenden Conley
date: 2011-10-27 13:50:30.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2011-10-27 14:10:15.000000000

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

Build Unstable 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/1831/ : UNSTABLE

-------------------------------------
author: Douglas Trujillo
date: 2011-10-27 21:27:27.000000000

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

(4 inline comments)



Line:96, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/FileChecker.java -> typo: s/described/describes/

Line:123, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/FileChecker.java -> typo: s/reposrted/reported/

Line:273, org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties -> typo: s/Plaese/Please/

Line:12, /COMMIT_MSG -> typo: s/gived/gives/

-------------------------------------
author: Marlie Beasley
date: 2011-10-28 08:55:36.000000000

Patch Set 1: (4 inline comments)



Line:96, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/FileChecker.java -> Done

Line:123, org.eclipse.egit.core/src/org/eclipse/egit/core/internal/FileChecker.java -> Done

Line:273, org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties -> Done

Line:12, /COMMIT_MSG -> Done

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