| commit | 222a1cb7ba65854e3ed89aa21ca20025e1741c68 | |
| author | Markus Duft <markus.duft@salomon.at> | |
| Fri, 20 Jan 2012 22:34:12 +0000 (20 23:34 +0100) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Fri, 20 Jan 2012 22:34:12 +0000 (20 23:34 +0100) | ||
| tree | e0fae782d8b237ec431944930eb53835334853ba | treesnapshot (tar.gz zip) |
| parent | 0c83c49451082f717af5699a9dd80625c275c499 | commitdiff |
Nice checkout conflict display instead of internal error
When switching branches by double-clicking their label, a nice checkout
conflict display appears if a conflict exists. When creating a new
branch, an ugly error box is shown instead. By detecting the
CheckoutConflictException explicitly and just returning, the
BranchResultDialog will be used there too, and show a nice overview of
all conflicts. Exception handling needs to be cleaned up (bug 369303)
when JGit has fixed bug 356922.
Change-Id: Ic772f519c5e36dcc1b0326dc1045497b211aaa66
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
When switching branches by double-clicking their label, a nice checkout
conflict display appears if a conflict exists. When creating a new
branch, an ugly error box is shown instead. By detecting the
CheckoutConflictException explicitly and just returning, the
BranchResultDialog will be used there too, and show a nice overview of
all conflicts. Exception handling needs to be cleaned up (bug 369303)
when JGit has fixed bug 356922.
Change-Id: Ic772f519c5e36dcc1b0326dc1045497b211aaa66
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| org.eclipse.egit.core/src/org/eclipse/egit/core/op/BranchOperation.java | diffblobblamehistory |